Merge lp:~roryj/wingpanel/fix-menu-margins into lp:~elementary-pantheon/wingpanel/trunk-0.3.x

[Rory]

Increase start and end margins by 1, decrease top and bottom margins by 10

Increase menu margins by 1 pixel to match normal menus.

(Definitely not being pedantic)

[Danielle Foré (danrabbit)]

While you're in here, can you change margin_left and margin_right to margin_start and margin_end? left and right are deprecated

Otherwise, it looks fine to me :)

[lp:~roryj/wingpanel/fix-menu-margins]

193. By Rory on 2014-12-15

Change to margin_start/margin_end

[Rory (roryj)]

Done. While I'm at it, are the top and bottom margins correct?... they are much larger than the equivalent context menu and do look slightly strange to me!

[Rory (roryj)]

And I'm assuming this bug https://bugs.launchpad.net/wingpanel/+bug/1349161 can be closed as the menus look fine to me with gtk 3.14.6?

[Danielle Foré (danrabbit)]

Hey you're right! It does seem to be fixed.

I'd like to get feedback from someone on gtk 3.12 before merging, but to my eye it looks like reducing the top and bottom margins would make it look a little more like regular menus. Something like:
            entry.menu.margin_top = 18;
            entry.menu.margin_bottom = 8;

[lp:~roryj/wingpanel/fix-menu-margins]

194. By Rory on 2014-12-15

Decrease margin_top/margin_bottom by 10px.

=== modified file 'src/Indicator/IndicatorObjectEntry.vala'
--- src/Indicator/IndicatorObjectEntry.vala	2014-10-05 18:20:38 +0000
+++ src/Indicator/IndicatorObjectEntry.vala	2014-12-15 21:14:13 +0000
@@ -108,8 +108,8 @@
         }
 
         private void setup_margin (Gtk.Widget widget) {
-            widget.margin_left = 10;
-            widget.margin_right = 9;
+            widget.margin_start = 11;
+            widget.margin_end = 10;
         }
 
         private void setup_drawing () {
@@ -117,8 +117,8 @@
 
             buffer = new Granite.Drawing.BufferSurface (100, 100);
 
-            entry.menu.margin_top = 28;
-            entry.menu.margin_bottom = 18;
+            entry.menu.margin_top = 18;
+            entry.menu.margin_bottom = 8;
 
             Granite.Widgets.Utils.set_theming (entry.menu, MENU_STYLESHEET, null,
                                                Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);