summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--gtk/src/ghbcompositor.c3
-rw-r--r--gtk/src/preview.c6
2 files changed, 5 insertions, 4 deletions
diff --git a/gtk/src/ghbcompositor.c b/gtk/src/ghbcompositor.c
index 486ed420c..d1517340c 100644
--- a/gtk/src/ghbcompositor.c
+++ b/gtk/src/ghbcompositor.c
@@ -617,7 +617,8 @@ ghb_compositor_blend (GtkWidget *widget, GdkEventExpose *event)
{
/* get our child */
child = GTK_WIDGET(draw->data);
- if (!GTK_WIDGET_VISIBLE(child))
+ if (!GTK_WIDGET_VISIBLE(cc->widget) ||
+ !GTK_WIDGET_VISIBLE(child))
continue;
/* the source data is the (composited) event box */
diff --git a/gtk/src/preview.c b/gtk/src/preview.c
index 7986c6472..07ae765df 100644
--- a/gtk/src/preview.c
+++ b/gtk/src/preview.c
@@ -1043,7 +1043,7 @@ hud_timeout(signal_user_data_t *ud)
g_debug("hud_timeout()");
widget = GHB_WIDGET(ud->builder, "preview_hud");
- gtk_widget_hide_all(widget);
+ gtk_widget_hide(widget);
hud_timeout_id = 0;
return FALSE;
}
@@ -1066,7 +1066,7 @@ hud_enter_cb(
g_source_destroy(source);
}
widget = GHB_WIDGET(ud->builder, "preview_hud");
- gtk_widget_show_all(widget);
+ gtk_widget_show(widget);
hud_timeout_id = 0;
return FALSE;
}
@@ -1112,7 +1112,7 @@ preview_motion_cb(
widget = GHB_WIDGET(ud->builder, "preview_hud");
if (!GTK_WIDGET_VISIBLE(widget))
{
- gtk_widget_show_all(widget);
+ gtk_widget_show(widget);
}
hud_timeout_id = g_timeout_add_seconds(4, (GSourceFunc)hud_timeout, ud);
return FALSE;