1
=== modified file 'src/Indicator/IndicatorObjectEntry.vala'
2
--- src/Indicator/IndicatorObjectEntry.vala	2013-08-19 19:12:24 +0000
3
+++ src/Indicator/IndicatorObjectEntry.vala	2013-08-25 14:51:25 +0000
4
@@ -27,8 +27,6 @@
5
27
        // used for drawing
27
        // used for drawing
6
28
        private Gtk.Window menu;
28
        private Gtk.Window menu;
7
29
        private Granite.Drawing.BufferSurface buffer;
29
        private Granite.Drawing.BufferSurface buffer;
8
30
        private int w = -1;
9
31
        private int h = -1;
10
32
        private int arrow_height = 10;
30
        private int arrow_height = 10;
11
33
        private int arrow_width = 20;
31
        private int arrow_width = 20;
12
34
        private double x = 10.5;
32
        private double x = 10.5;
13
@@ -75,6 +73,9 @@
14
75
73
15
76
            entry.menu.get_children ().foreach (setup_margin);
74
            entry.menu.get_children ().foreach (setup_margin);
16
77
            entry.menu.insert.connect (setup_margin);
75
            entry.menu.insert.connect (setup_margin);
17
76
18
77
            entry.menu.set_redraw_on_allocate (true);
19
78
            entry.menu.configure_event.connect (entry_menu_configure_event_callback);
20
78
        }
79
        }
21
79
80
22
80
        public IndicatorIface get_indicator () {
81
        public IndicatorIface get_indicator () {
23
@@ -113,39 +114,50 @@
24
113
            menu_parent.app_paintable = true;
114
            menu_parent.app_paintable = true;
25
114
            menu_parent.set_visual (Gdk.Screen.get_default ().get_rgba_visual ());
115
            menu_parent.set_visual (Gdk.Screen.get_default ().get_rgba_visual ());
26
115
116
27
117
            menu_parent.set_redraw_on_allocate (true);
28
118
            menu_parent.configure_event.connect (entry_menu_parent_configure_event_callback);
29
116
            menu_parent.draw.connect (entry_menu_parent_draw_callback);
119
            menu_parent.draw.connect (entry_menu_parent_draw_callback);
30
117
        }
120
        }
31
118
121
32
122
        private bool entry_menu_configure_event_callback (Gdk.EventConfigure event) {
33
123
            entry.menu.queue_draw ();
34
124
            return false;
35
125
        }
36
126
37
127
        private bool entry_menu_parent_configure_event_callback (Gdk.EventConfigure event) {
38
128
            var menu_parent = entry.menu.get_parent ();
39
129
            menu_parent.queue_draw ();
40
130
            return false;
41
131
        }
42
132
43
119
        private bool entry_menu_parent_draw_callback (Cairo.Context ctx) {
133
        private bool entry_menu_parent_draw_callback (Cairo.Context ctx) {
73
120
            var new_w  = entry.menu.get_parent ().get_allocated_width ();
134
            var menu_parent = entry.menu.get_parent ();
74
121
            var new_h = entry.menu.get_parent ().get_allocated_height ();
135
            int menu_width  = menu_parent.get_allocated_width ();
75
122
136
            int menu_height = menu_parent.get_allocated_height ();
76
123
            if (new_w != w || new_h != h) {
137
            int indicator_width  = get_allocated_width ();
77
124
                w = new_w;
138
            int indicator_height = get_allocated_height ();
78
125
                h = new_h;
139
79
126
140
            buffer = new Granite.Drawing.BufferSurface (menu_width, menu_height);
80
127
                buffer = new Granite.Drawing.BufferSurface (w, h);
141
            cairo_popover (menu_width, menu_height, indicator_width, indicator_height);
81
128
                cairo_popover (w, h);
142
82
129
143
            var cr = buffer.context;
83
130
                var cr = buffer.context;
144
84
131
145
            // shadow
85
132
                // shadow
146
            cr.set_source_rgba (0, 0, 0, 0.5);
86
133
                cr.set_source_rgba (0, 0, 0, 0.5);
147
            cr.fill_preserve ();
87
134
                cr.fill_preserve ();
148
            buffer.exponential_blur (6);
88
135
                buffer.exponential_blur (6);
149
            cr.clip ();
89
136
                cr.clip ();
150
90
137
151
            // background
91
138
                // background
152
            menu.get_style_context ().render_background (cr, 0, 0, menu_width, menu_height);
92
139
                menu.get_style_context ().render_background (cr, 0, 0, w, h);
153
            cr.reset_clip ();
93
140
                cr.reset_clip ();
154
94
141
155
            // border
95
142
                // border
156
            cairo_popover (menu_width, menu_height, indicator_width, indicator_height);
96
143
                cairo_popover (w, h);
157
            cr.set_operator (Cairo.Operator.SOURCE);
97
144
                cr.set_operator (Cairo.Operator.SOURCE);
158
            cr.set_line_width (1);
98
145
                cr.set_line_width (1);
159
            Gdk.cairo_set_source_rgba (cr, menu.get_style_context ().get_border_color (Gtk.StateFlags.NORMAL));
99
146
                Gdk.cairo_set_source_rgba (cr, menu.get_style_context ().get_border_color (Gtk.StateFlags.NORMAL));
160
            cr.stroke ();
71
147
                cr.stroke ();
72
148
            }
100
149
161
101
150
            // clear surface to transparent
162
            // clear surface to transparent
102
151
            ctx.set_operator (Cairo.Operator.SOURCE);
163
            ctx.set_operator (Cairo.Operator.SOURCE);
103
@@ -159,34 +171,48 @@
104
159
            return false;
171
            return false;
105
160
        }
172
        }
106
161
173
111
162
        private void cairo_popover (int w, int h) {
174
        private void cairo_popover (int menu_width, int menu_height, int indicator_width, int indicator_height) {
108
163
            w = w - 20;
109
164
            h = h - 20;
110
165
112
166
            // Get some nice pos for the arrow
175
            // Get some nice pos for the arrow
113
167
            var offs = 30;
176
            var offs = 30;
114
168
            int p_x;
177
            int p_x;
115
169
            int w_x;
178
            int w_x;
116
179
            bool draw_tr_arc = true;
117
180
            bool draw_tl_arc = true;
118
170
            Gtk.Allocation alloc;
181
            Gtk.Allocation alloc;
119
171
            this.get_window ().get_origin (out p_x, null);
120
172
            this.get_allocation (out alloc);
121
173
182
122
183
            get_window ().get_origin (out p_x, null);
123
184
            get_allocation (out alloc);
124
174
            entry.menu.get_window ().get_origin (out w_x, null);
185
            entry.menu.get_window ().get_origin (out w_x, null);
125
175
186
133
176
            offs = (p_x + alloc.x) - w_x + this.get_allocated_width () / 4;
187
            offs = (p_x + alloc.x) - w_x + (indicator_width / 2) - (arrow_width / 2);
134
177
            if (offs + 50 > (w + 20))
188
135
178
                offs = (w + 20) - 15 - arrow_width;
189
            if (offs > menu_width - 10 - arrow_width) {
136
179
            if (offs < 17)
190
                offs = menu_width - 10 - arrow_width;
137
180
                offs = 17;
191
                draw_tr_arc = false;
138
181
192
            }
139
182
            buffer.context.arc (x + radius, y + arrow_height + radius, radius, Math.PI, Math.PI * 1.5);
193
140
194
            if (offs < 10) {
141
195
                offs = 10;
142
196
                draw_tl_arc = false;
143
197
            }
144
198
145
199
            menu_width -= 20;
146
200
            menu_height -= 20;
147
201
148
202
            // Don't draw top left arc if arrow needs to be placed there
149
203
            if (draw_tl_arc)
150
204
                buffer.context.arc (x + radius, y + arrow_height + radius, radius, Math.PI, Math.PI * 1.5);
151
205
152
183
            buffer.context.line_to (offs, y + arrow_height);
206
            buffer.context.line_to (offs, y + arrow_height);
153
184
            buffer.context.rel_line_to (arrow_width / 2.0, -arrow_height);
207
            buffer.context.rel_line_to (arrow_width / 2.0, -arrow_height);
154
185
            buffer.context.rel_line_to (arrow_width / 2.0, arrow_height);
208
            buffer.context.rel_line_to (arrow_width / 2.0, arrow_height);
159
186
            buffer.context.arc (x + w - radius, y + arrow_height + radius, radius, Math.PI * 1.5, Math.PI * 2.0);
209
160
187
210
            // Don't draw top right arc if arrow needs to be placed there
161
188
            buffer.context.arc (x + w - radius, y + h - radius, radius, 0, Math.PI * 0.5);
211
            if (draw_tr_arc)
162
189
            buffer.context.arc (x + radius, y + h - radius, radius, Math.PI * 0.5, Math.PI);
212
                buffer.context.arc (x + menu_width - radius, y + arrow_height + radius, radius, Math.PI * 1.5, Math.PI * 2.0);
163
213
164
214
            buffer.context.arc (x + menu_width - radius, y + menu_height - radius, radius, 0, Math.PI * 0.5);
165
215
            buffer.context.arc (x + radius, y + menu_height - radius, radius, Math.PI * 0.5, Math.PI);
166
190
216
167
191
            buffer.context.close_path ();
217
            buffer.context.close_path ();
168
192
        }
218
        }
Reviewer	Date Requested	Status
Danielle Foré	2013-08-26	Approve on 2014-01-26
David Gomes (community)	2013-08-25	Approve on 2013-08-26
Review via email: mp+181999@code.launchpad.net