Merge lp:~azzar1/unity/fix-1097184 into lp:unity

[Andrea Azzarone]

Remove the empty space between launcher and dash in non-default launcher size.

== Probelem ==
empty space between launcher and dash in non default launcher size

== Test ==
Ap test added.

[Didier Roche-Tolomelli (didrocks)]

approving the change, working fine and code looks good with tests. Note however that there is still this little "jump" when we don't have the default size launcher icon when unity is loading.

review: Approve

=== modified file 'launcher/LauncherController.cpp'
--- launcher/LauncherController.cpp	2012-12-07 04:21:35 +0000
+++ launcher/LauncherController.cpp	2013-01-08 11:53:25 +0000
@@ -319,6 +319,10 @@
   launcher_window->InputWindowEnableStruts(parent_->options()->hide_mode == LAUNCHER_HIDE_NEVER);
   launcher_window->SetEnterFocusInputArea(launcher);
 
+  launcher_window->geometry_changed.connect([this] (nux::Area* /*area*/, nux::Geometry const& geo) {
+    parent_->launcher_width_changed.emit(geo.width);
+  });
+
   launcher->add_request.connect(sigc::mem_fun(this, &Impl::OnLauncherAddRequest));
   launcher->remove_request.connect(sigc::mem_fun(this, &Impl::OnLauncherRemoveRequest));
 

=== modified file 'launcher/LauncherController.h'
--- launcher/LauncherController.h	2012-12-07 04:21:35 +0000
+++ launcher/LauncherController.h	2013-01-08 11:53:25 +0000
@@ -83,6 +83,8 @@
 
   void UpdateSuperTapDuration(int const super_tap_duration);
 
+  sigc::signal<void, int> launcher_width_changed;
+
 protected:
   // Introspectable methods
   std::string GetName() const;

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2013-01-07 16:19:54 +0000
+++ plugins/unityshell/src/unityshell.cpp	2013-01-08 11:53:25 +0000
@@ -2940,12 +2940,6 @@
       hud_controller_->icon_size = launcher_options->icon_size();
       hud_controller_->tile_size = launcher_options->tile_size();
 
-      /* The launcher geometry includes 1px used to draw the right margin
-       * that must not be considered when drawing an overlay */
-      hud_controller_->launcher_width = launcher_controller_->launcher().GetAbsoluteWidth() - 1;
-      dash_controller_->launcher_width = launcher_controller_->launcher().GetAbsoluteWidth() - 1;
-      panel_controller_->launcher_width = launcher_controller_->launcher().GetAbsoluteWidth() - 1;
-
       if (p)
       {
         CompOption::Vector &opts = p->vTable->getOptions ();
@@ -3152,6 +3146,14 @@
 
   AddChild(dash_controller_.get());
 
+  launcher_controller_->launcher_width_changed.connect([this] (int launcher_width) {
+    /* The launcher geometry includes 1px used to draw the right margin
+     * that must not be considered when drawing an overlay */
+    hud_controller_->launcher_width = launcher_width - 1;
+    dash_controller_->launcher_width = launcher_width - 1;
+    panel_controller_->launcher_width = launcher_width - 1;
+  });
+
   ScheduleRelayout(0);
 }
 

=== modified file 'tests/autopilot/unity/tests/test_dash.py'
--- tests/autopilot/unity/tests/test_dash.py	2012-11-23 16:15:07 +0000
+++ tests/autopilot/unity/tests/test_dash.py	2013-01-08 11:53:25 +0000
@@ -582,6 +582,18 @@
 class DashVisualTests(DashTestCase):
     """Tests that the dash visual is correct."""
 
+    def test_dash_position_with_non_default_launcher_width(self):
+        """"There should be no empty space between launcher and dash when the launcher
+        has a non-default width.
+        """
+        self.set_unity_option('icon_size', 60)
+        self.dash.ensure_visible()
+
+        monitor = self.dash.monitor
+        launcher = self.launcher.get_launcher_for_monitor(monitor)
+
+        self.assertThat(self.dash.geometry[0], Eventually(Equals(launcher.geometry[0] + launcher.geometry[2] - 1)))
+
     def test_see_more_result_alignment(self):
         """The see more results label should be baseline aligned
         with the category name label.