Merge lp:~ken-vandine/ido/lp_925700 into lp:ido/0.3

Proposed by Ken VanDine
Status: Merged
Merged at revision: 100
Proposed branch: lp:~ken-vandine/ido/lp_925700
Merge into: lp:ido/0.3
Diff against target: 46 lines (+7/-4)
1 file modified
src/idooffscreenproxy.c (+7/-4)
To merge this branch: bzr merge lp:~ken-vandine/ido/lp_925700
Reviewer Review Type Date Requested Status
Cody Russell (community) Approve
Canonical Desktop Experience Team Pending
Review via email: mp+92201@code.launchpad.net

Description of the change

add style class "menubar" to the offscreen proxy, this fixes the white background drawn in the sound menu with the current gtk3/light-themes (LP: #925700)

To post a comment you must log in.
Revision history for this message
Cody Russell (bratsche) wrote :

Looks fine to me, fwiw.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/idooffscreenproxy.c'
--- src/idooffscreenproxy.c 2011-09-06 17:52:37 +0000
+++ src/idooffscreenproxy.c 2012-02-09 04:43:17 +0000
@@ -211,6 +211,10 @@
211 | GDK_ENTER_NOTIFY_MASK211 | GDK_ENTER_NOTIFY_MASK
212 | GDK_LEAVE_NOTIFY_MASK;212 | GDK_LEAVE_NOTIFY_MASK;
213 attributes.visual = gdk_screen_get_rgba_visual (gdk_screen_get_default ());//gtk_widget_get_visual (widget);213 attributes.visual = gdk_screen_get_rgba_visual (gdk_screen_get_default ());//gtk_widget_get_visual (widget);
214 if (!attributes.visual)
215 {
216 attributes.visual = gdk_screen_get_system_visual (gdk_screen_get_default ());
217 }
214 attributes.wclass = GDK_INPUT_OUTPUT;218 attributes.wclass = GDK_INPUT_OUTPUT;
215 219
216 attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL;220 attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL;
@@ -478,6 +482,8 @@
478 482
479 sc = get_menu_style_context();483 sc = get_menu_style_context();
480484
485 gtk_style_context_add_class (sc, "menubar");
486
481 gtk_render_background (sc, cr,487 gtk_render_background (sc, cr,
482 0, 0,488 0, 0,
483 gdk_window_get_width (window),489 gdk_window_get_width (window),
@@ -485,8 +491,6 @@
485 491
486 g_object_unref (sc);492 g_object_unref (sc);
487493
488
489
490 if (gtk_cairo_should_draw_window (cr, window))494 if (gtk_cairo_should_draw_window (cr, window))
491 {495 {
492 cairo_surface_t *surface;496 cairo_surface_t *surface;
@@ -501,12 +505,11 @@
501 }505 }
502 else if (gtk_cairo_should_draw_window (cr, proxy->priv->offscreen_window))506 else if (gtk_cairo_should_draw_window (cr, proxy->priv->offscreen_window))
503 {507 {
504
505 if (proxy->priv->child)508 if (proxy->priv->child)
506 gtk_container_propagate_draw (GTK_CONTAINER (widget),509 gtk_container_propagate_draw (GTK_CONTAINER (widget),
507 proxy->priv->child,510 proxy->priv->child,
508 cr);511 cr);
509 }512 }
510 513
511 return TRUE;514 return TRUE;
512}515}

Subscribers

People subscribed via source and target branches