diff options
author | jstebbins <[email protected]> | 2010-02-23 17:14:27 +0000 |
---|---|---|
committer | jstebbins <[email protected]> | 2010-02-23 17:14:27 +0000 |
commit | 779e39b064f80824671610e3c58ad4792eefa6ba (patch) | |
tree | 58c59bd05aa20966033f38fc1a7d993068dcfd85 /gtk | |
parent | 0c9211727863e8d23f54bfba567e2e31f0c64855 (diff) |
LinGui: let's try fixing hud expose rendering again
the last try showed widgets on the hud that should have stayed hidden
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3137 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'gtk')
-rw-r--r-- | gtk/src/ghbcompositor.c | 3 | ||||
-rw-r--r-- | gtk/src/preview.c | 6 |
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; |