← Back to branch summary

~gnome3-team/murrine/ubuntu

« back to all changes in this revision

Viewing changes to debian/patches/01_display_only_selected_menu_items.patch

  • Committer: Robert Ancell
  • Date: 2010-11-11 04:36:30 UTC
  • Revision ID: robert.ancell@canonical.com-20101111043630-3sqz88f9wbj7zkrp
Make new GTK3 murrine package

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/01_display_only_selected_menu_items.patch
 
1
=== modified file 'gtk2-engines-murrine/src/murrine_draw.c'
 
2
--- gtk2-engines-murrine/src/murrine_draw.c     2010-03-29 16:46:10 +0000
 
3
+++ gtk2-engines-murrine/src/murrine_draw.c     2010-03-29 17:34:42 +0000
 
4
@@ -2315,6 +2315,23 @@ murrine_draw_radiobutton (cairo_t *cr,
 
5
        inconsistent = (checkbox->shadow_type == GTK_SHADOW_ETCHED_IN);
 
6
        draw_bullet |= inconsistent;
 
7
 
 
8
+        if (checkbox->in_menu)
 
9
+        {
 
10
+                if (draw_bullet)
 
11
+                {
 
12
+                        dot = &colors->text[0];
 
13
+
 
14
+                        murrine_set_color_rgba (cr, dot, trans);
 
15
+
 
16
+                        cairo_translate (cr, x, y);
 
17
+
 
18
+                        cairo_arc (cr, 7, 7, 2.5, 0, G_PI*2);
 
19
+                        cairo_fill (cr);
 
20
+                }
 
21
+
 
22
+                return;
 
23
+        }
 
24
+
 
25
        width = height = 14;
 
26
 
 
27
        if (widget->state_type == GTK_STATE_INSENSITIVE)
 
28
@@ -2468,60 +2485,64 @@ murrine_draw_checkbox (cairo_t *cr,
 
29
 
 
30
        cairo_translate (cr, x, y);
 
31
 
 
32
-       if (widget->xthickness > 2 && widget->ythickness > 2)
 
33
-       {
 
34
-               if (widget->reliefstyle > 1 && draw_bullet && widget->state_type != GTK_STATE_INSENSITIVE)
 
35
-               {
 
36
-                       MurrineRGB shadow;
 
37
-                       murrine_shade (border, 0.9, &shadow);
 
38
-
 
39
-                       murrine_draw_shadow (cr, &shadow,
 
40
-                                            0.5, 0.5, width-1, height-1,
 
41
-                                            roundness+1, widget->corners,
 
42
-                                            widget->reliefstyle,
 
43
-                                            mrn_gradient_new, 0.08);
 
44
-               }
 
45
-               else if (widget->reliefstyle != 0)
 
46
-                       murrine_draw_inset (cr, &widget->parentbg, 0.5, 0.5, width-1, height-1, roundness+1, widget->corners);
 
47
-       }
 
48
-
 
49
-       cairo_save (cr);
 
50
-
 
51
-       murrine_rounded_rectangle_closed (cr, 1.5, 1.5, width-3, height-3, roundness, widget->corners);
 
52
-       cairo_clip_preserve (cr);
 
53
+        if (!checkbox->in_menu)
 
54
+        {
 
55
 
 
56
-       if (draw_bullet)
 
57
-       {
 
58
-               murrine_draw_glaze (cr, bg,
 
59
-                                   widget->glow_shade, highlight_shade_new, lightborder_shade_new,
 
60
-                                   mrn_gradient_new, widget, 2, 2, width-4, height-4,
 
61
-                                   roundness, widget->corners, TRUE);
 
62
-       }
 
63
-       else
 
64
-       {
 
65
-               murrine_set_color_rgb (cr, bg);
 
66
-               cairo_fill (cr);
 
67
-       }
 
68
-
 
69
-       cairo_restore (cr);
 
70
-
 
71
-       if (checkbox->in_menu || checkbox->in_cell)
 
72
-       {
 
73
-               mrn_gradient_new.border_shades[0] = 1.0;
 
74
-               mrn_gradient_new.border_shades[1] = 1.0;
 
75
-               if (!draw_bullet)
 
76
-                       mrn_gradient_new.has_border_colors = FALSE;
 
77
-       }
 
78
-       else if (!draw_bullet)
 
79
-       {
 
80
-               mrn_gradient_new = murrine_get_inverted_border_shades (mrn_gradient_new);
 
81
-               mrn_gradient_new.has_border_colors = FALSE;
 
82
-       }
 
83
-
 
84
-       murrine_draw_border (cr, border,
 
85
-                            1.5, 1.5, width-3, height-3,
 
86
-                            roundness, widget->corners,
 
87
-                            mrn_gradient_new, 1.0);
 
88
+                if (widget->xthickness > 2 && widget->ythickness > 2)
 
89
+                {
 
90
+                        if (widget->reliefstyle > 1 && draw_bullet && widget->state_type != GTK_STATE_INSENSITIVE)
 
91
+                        {
 
92
+                                MurrineRGB shadow;
 
93
+                                murrine_shade (border, 0.9, &shadow);
 
94
+
 
95
+                                murrine_draw_shadow (cr, &shadow,
 
96
+                                                     0.5, 0.5, width-1, height-1,
 
97
+                                                     roundness+1, widget->corners,
 
98
+                                                     widget->reliefstyle,
 
99
+                                                     mrn_gradient_new, 0.08);
 
100
+                        }
 
101
+                        else if (widget->reliefstyle != 0)
 
102
+                                murrine_draw_inset (cr, &widget->parentbg, 0.5, 0.5, width-1, height-1, roundness+1, widget->corners);
 
103
+                }
 
104
+
 
105
+                cairo_save (cr);
 
106
+
 
107
+                murrine_rounded_rectangle_closed (cr, 1.5, 1.5, width-3, height-3, roundness, widget->corners);
 
108
+                cairo_clip_preserve (cr);
 
109
+
 
110
+                if (draw_bullet)
 
111
+                {
 
112
+                        murrine_draw_glaze (cr, bg,
 
113
+                                            widget->glow_shade, highlight_shade_new, lightborder_shade_new,
 
114
+                                            mrn_gradient_new, widget, 2, 2, width-4, height-4,
 
115
+                                            roundness, widget->corners, TRUE);
 
116
+                }
 
117
+                else
 
118
+                {
 
119
+                        murrine_set_color_rgb (cr, bg);
 
120
+                        cairo_fill (cr);
 
121
+                }
 
122
+
 
123
+                cairo_restore (cr);
 
124
+
 
125
+                if (checkbox->in_menu || checkbox->in_cell)
 
126
+                {
 
127
+                       mrn_gradient_new.border_shades[0] = 1.0;
 
128
+                        mrn_gradient_new.border_shades[1] = 1.0;
 
129
+                        if (!draw_bullet)
 
130
+                                mrn_gradient_new.has_border_colors = FALSE;
 
131
+                }
 
132
+                else if (!draw_bullet)
 
133
+                {
 
134
+                        mrn_gradient_new = murrine_get_inverted_border_shades (mrn_gradient_new);
 
135
+                        mrn_gradient_new.has_border_colors = FALSE;
 
136
+                }
 
137
+
 
138
+                murrine_draw_border (cr, border,
 
139
+                                     1.5, 1.5, width-3, height-3,
 
140
+                                     roundness, widget->corners,
 
141
+                                     mrn_gradient_new, 1.0);
 
142
+        }
 
143
 
 
144
        if (draw_bullet)
 
145
        {
 
146