Merge lp:~brandontschaefer/unity/lp.1109150-fix-dash-indicators into lp:unity

[Brandon Schaefer]

Clicking on the indicators in the dash will now open them! (And close the dash).

=== Problem ===
The panel is below the Dash when opened. This means mouse events do not get to the indicator. (This has to be this way due to the dash previews)

=== Fix ===
Check when a mouse event happens in unityshell.cpp and check if the mouse event is over an indicator. Another problem was the dash animation takes to long to finish before the mouse event gets to the indicators. So I had to make a new function that would simply hide the dash right away, so the mouse event would get to the indicator.

=== Test ===
AP test.

[MC Return (mc-return)]

LGTM. +1

review: Approve

[Andrea Azzarone (azzar1)]

+bool Controller::IsMouseInsideIndicator(nux::Point mouse_position) const

nux::Point const& mo.. ?

Btw looks good to me and works here.

review: Approve

[Andrea Azzarone (azzar1)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
Unapproved changes made after approval.
http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/373/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/./build=pbuilder,distribution=raring,flavor=amd64/373/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/./build=pbuilder,distribution=raring,flavor=i386/373/console

review: Needs Fixing (continuous-integration)

=== modified file 'dash/DashController.cpp'
--- dash/DashController.cpp	2012-12-13 14:26:56 +0000
+++ dash/DashController.cpp	2013-01-30 19:02:24 +0000
@@ -334,6 +334,13 @@
   nux::GetWindowCompositor().SetKeyFocusArea(view_->default_focus());
 }
 
+void Controller::QuicklyHideDash(bool restore)
+{
+  HideDash(restore);
+  timeline_animator_.Stop();
+  window_->ShowWindow(false);
+}
+
 void Controller::HideDash(bool restore)
 {
   if (!visible_)

=== modified file 'dash/DashController.h'
--- dash/DashController.h	2012-12-13 03:17:19 +0000
+++ dash/DashController.h	2013-01-30 19:02:24 +0000
@@ -59,6 +59,7 @@
   sigc::signal<void> on_realize;
 
   void HideDash(bool restore_focus = true);
+  void QuicklyHideDash(bool restore_focus = true);
   void ShowDash();
 
   void ReFocusKeyInput();

=== modified file 'panel/PanelController.cpp'
--- panel/PanelController.cpp	2012-11-08 09:12:24 +0000
+++ panel/PanelController.cpp	2013-01-30 19:02:24 +0000
@@ -59,6 +59,7 @@
                           int discovery_fadein, int discovery_fadeout);
 
   void OnScreenChanged(unsigned int primary_monitor, std::vector<nux::Geometry>& monitors, Introspectable *iobj);
+
 private:
   typedef nux::ObjectPtr<nux::BaseWindow> BaseWindowPtr;
 
@@ -291,6 +292,19 @@
   geo = window->GetGeometry();
 }
 
+bool Controller::IsMouseInsideIndicator(nux::Point const& mouse_position) const
+{
+  for (auto view : pimpl->GetPanelViews())
+  {
+    PanelView* panel_view = static_cast<PanelView*>(view);
+
+    if (panel_view->IsMouseInsideIndicator(mouse_position))
+      return true;
+  }
+
+  return false;
+}
+
 float Controller::Impl::opacity() const
 {
   return opacity_;

=== modified file 'panel/PanelController.h'
--- panel/PanelController.h	2012-09-11 13:57:19 +0000
+++ panel/PanelController.h	2013-01-30 19:02:24 +0000
@@ -53,6 +53,8 @@
 
   float opacity() const;
 
+  bool IsMouseInsideIndicator(nux::Point const& mouse_position) const;
+
   std::string GetName() const;
   void AddProperties(GVariantBuilder* builder);
 private:

=== modified file 'panel/PanelView.cpp'
--- panel/PanelView.cpp	2013-01-29 00:32:06 +0000
+++ panel/PanelView.cpp	2013-01-30 19:02:24 +0000
@@ -174,6 +174,11 @@
   QueueDraw();
 }
 
+bool PanelView::IsMouseInsideIndicator(nux::Point const& mouse_position) const
+{
+  return indicators_->GetGeometry().IsInside(mouse_position);
+}
+
 void PanelView::OnBackgroundUpdate(GVariant *data)
 {
   gdouble red, green, blue, alpha;

=== modified file 'panel/PanelView.h'
--- panel/PanelView.h	2012-12-18 19:25:50 +0000
+++ panel/PanelView.h	2013-01-30 19:02:24 +0000
@@ -66,6 +66,8 @@
 
   void SetLauncherWidth(int width);
 
+  bool IsMouseInsideIndicator(nux::Point const& mouse_position) const;
+
 protected:
   void Draw(nux::GraphicsEngine& GfxContext, bool force_draw);
   void DrawContent(nux::GraphicsEngine& GfxContext, bool force_draw);

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2013-01-24 18:56:11 +0000
+++ plugins/unityshell/src/unityshell.cpp	2013-01-30 19:02:24 +0000
@@ -1530,11 +1530,23 @@
 
         Window dash_xid = dash_controller_->window()->GetInputWindowId();
         Window top_xid = wm.GetTopWindowAbove(dash_xid);
-        nux::Geometry const& on_top_geo = wm.GetWindowGeometry(top_xid);
-
-        if (!dash_geo.IsInside(pt) && !DoesPointIntersectUnityGeos(pt) && !on_top_geo.IsInside(pt))
+        nux::Geometry const& always_on_top_geo = wm.GetWindowGeometry(top_xid);
+
+        bool indicator_clicked = panel_controller_->IsMouseInsideIndicator(pt);
+        bool outside_dash = !dash_geo.IsInside(pt) && !DoesPointIntersectUnityGeos(pt);
+
+        if ((outside_dash || indicator_clicked) && !always_on_top_geo.IsInside(pt))
         {
-          dash_controller_->HideDash(false);
+          if (indicator_clicked)
+          {
+            // We must skip the Dash hide animation, otherwise the indicators
+            // wont recive the mouse click event
+            dash_controller_->QuicklyHideDash();
+          }
+          else
+          {
+            dash_controller_->HideDash(false);
+          }
         }
       }
 

=== modified file 'tests/autopilot/unity/tests/test_panel.py'
--- tests/autopilot/unity/tests/test_panel.py	2013-01-29 01:25:46 +0000
+++ tests/autopilot/unity/tests/test_panel.py	2013-01-30 19:02:24 +0000
@@ -981,6 +981,18 @@
         self.assertThat(menu_entry.menu_x, Eventually(Equals(0)))
         self.assertThat(menu_entry.menu_y, Eventually(Equals(0)))
 
+    def test_indicator_opens_when_dash_is_open(self):
+        """When the dash is open and a click is on an indicator the dash
+        must close and the indicator must open.
+        """
+        self.dash.ensure_visible()
+
+        indicator = self.panel.indicators.get_indicator_by_name_hint("indicator-session")
+        self.mouse_open_indicator(indicator)
+
+        self.assertThat(indicator.active, Eventually(Equals(True)))
+        self.assertThat(self.dash.visible, Eventually(Equals(False)))
+
 
 class PanelKeyNavigationTests(PanelTestsBase):