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

Proposed by Ken VanDine on 2012-02-09
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 on 2012-02-09
Canonical Desktop Experience Team 2012-02-09 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.
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
1=== modified file 'src/idooffscreenproxy.c'
2--- src/idooffscreenproxy.c 2011-09-06 17:52:37 +0000
3+++ src/idooffscreenproxy.c 2012-02-09 04:43:17 +0000
4@@ -211,6 +211,10 @@
5 | GDK_ENTER_NOTIFY_MASK
6 | GDK_LEAVE_NOTIFY_MASK;
7 attributes.visual = gdk_screen_get_rgba_visual (gdk_screen_get_default ());//gtk_widget_get_visual (widget);
8+ if (!attributes.visual)
9+ {
10+ attributes.visual = gdk_screen_get_system_visual (gdk_screen_get_default ());
11+ }
12 attributes.wclass = GDK_INPUT_OUTPUT;
13
14 attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL;
15@@ -478,6 +482,8 @@
16
17 sc = get_menu_style_context();
18
19+ gtk_style_context_add_class (sc, "menubar");
20+
21 gtk_render_background (sc, cr,
22 0, 0,
23 gdk_window_get_width (window),
24@@ -485,8 +491,6 @@
25
26 g_object_unref (sc);
27
28-
29-
30 if (gtk_cairo_should_draw_window (cr, window))
31 {
32 cairo_surface_t *surface;
33@@ -501,12 +505,11 @@
34 }
35 else if (gtk_cairo_should_draw_window (cr, proxy->priv->offscreen_window))
36 {
37-
38 if (proxy->priv->child)
39 gtk_container_propagate_draw (GTK_CONTAINER (widget),
40 proxy->priv->child,
41 cr);
42- }
43+ }
44
45 return TRUE;
46 }

Subscribers

People subscribed via source and target branches