Merge lp:~victored/wingpanel/lp-1051655 into lp:~elementary-pantheon/wingpanel/trunk-0.3.x

[Victor Martinez]

Prevent overflowing when other indicators reach the date-time area. Push date-time indicator to the left instead. This code takes advantage of Gtk.Box's ability to center a widget. Fixes lp:1051655.

Prevent overflowing when other indicators reach the date-time area. Push date-time indicator to the left instead. This code takes advantage of Gtk.Box's ability to center a widget. Fixes lp:1051655.

=== modified file 'src/Widgets/MenuBar.vala'
--- src/Widgets/MenuBar.vala	2013-04-14 07:54:25 +0000
+++ src/Widgets/MenuBar.vala	2015-03-06 05:49:05 +0000
@@ -20,5 +20,9 @@
         can_focus = true;
         border_width = 0;
         get_style_context ().add_class (StyleClass.COMPOSITED_INDICATOR);
+
+        // make sure menubars are fully transparent when we later adjust the transparency
+        // in the panel's draw callback
+        override_background_color (Gtk.StateFlags.NORMAL, {0, 0, 0, 0});
     }
 }
 
=== modified file 'src/Widgets/Panel.vala'
--- src/Widgets/Panel.vala	2015-01-22 06:06:22 +0000
+++ src/Widgets/Panel.vala	2015-03-06 05:49:05 +0000
@@ -21,15 +21,11 @@
 namespace Wingpanel.Widgets {
 
     public class Panel : BasePanel {
+        private IndicatorLoader indicator_loader;
+        private IndicatorMenubar right_menubar;
+        private MenuBar left_menubar;
+        private MenuBar center_menubar;
         private Gtk.Box container;
-        private Gtk.Box left_wrapper;
-        private Gtk.Box right_wrapper;
-
-        private IndicatorMenubar menubar;
-        private MenuBar clock;
-        private MenuBar apps_menubar;
-
-        private IndicatorLoader indicator_loader;
 
         public Panel (Gtk.Application app, Services.Settings settings, IndicatorLoader indicator_loader) {
             base (settings);
@@ -38,11 +34,7 @@
             set_application (app);
 
             container = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0);
-            left_wrapper = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0);
-            right_wrapper = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0);
             container.set_homogeneous (false);
-            left_wrapper.set_homogeneous (false);
-            right_wrapper.set_homogeneous (false);
 
             add (container);
 
@@ -81,9 +73,9 @@
             string entry_name = entry.get_indicator ().get_name ();
 
             if (entry_name == "libdatetime.so" || entry_name == "com.canonical.indicator.datetime")
-                clock.prepend (entry);
+                center_menubar.prepend (entry);
             else
-                menubar.insert_sorted (entry);
+                right_menubar.insert_sorted (entry);
         }
 
         private void delete_entry (IndicatorWidget entry) {
@@ -96,39 +88,17 @@
         }
 
         private void add_defaults (Services.Settings settings) {
-            // Add Apps button
-            apps_menubar = new MenuBar ();
-            var apps_button = new Widgets.AppsButton (settings);
-            apps_menubar.append (apps_button);
-
-            left_wrapper.pack_start (apps_menubar, false, true, 0);
-
-            container.pack_start (left_wrapper);
-
-            clock = new MenuBar ();
-            container.pack_start (clock, false, false, 0);
-
-            // Menubar for storing indicators
-            menubar = new IndicatorMenubar ();
-
-            right_wrapper.pack_end (menubar, false, false, 0);
-            container.pack_end (right_wrapper);
-
-            var gpr = new Gtk.SizeGroup (Gtk.SizeGroupMode.HORIZONTAL);
-            gpr.add_widget (left_wrapper);
-            gpr.add_widget (right_wrapper);
-
-            // make sure those are all transparent when we later adjust the transparency
-            // in the panel's draw callback
-            clock.override_background_color (Gtk.StateFlags.NORMAL, Gdk.RGBA () {
-                red = 0.0, green = 0.0, blue = 0.0, alpha = 0.0
-            });
-            menubar.override_background_color (Gtk.StateFlags.NORMAL, Gdk.RGBA () {
-                red = 0.0, green = 0.0, blue = 0.0, alpha = 0.0
-            });
-            apps_menubar.override_background_color (Gtk.StateFlags.NORMAL, Gdk.RGBA () {
-                red = 0.0, green = 0.0, blue = 0.0, alpha = 0.0
-            });
+            left_menubar = new MenuBar ();
+            center_menubar = new MenuBar ();
+            right_menubar = new IndicatorMenubar ();
+
+            right_menubar.halign = Gtk.Align.END;
+
+            left_menubar.append (new Widgets.AppsButton (settings));
+
+            container.pack_start (left_menubar);
+            container.pack_end (right_menubar);
+            container.set_center_widget (center_menubar);
         }
     }
 }