Merge lp:~brandontschaefer/unity/multi-monitor-dash-hud-drawing-fix into lp:unity

[Brandon Schaefer]

Dash and Hud get drawn correctly no matter which monitor the mouse is in.

=== Problem ===
Anytime the Dash or Hud would get drawn it would ask what is the ideal monitor geo...so when your mouse was in another monitor it would say that monitor is the ideal place to draw the Dash or Hud.

=== Fix ===
If the Dash or Hud is visible use that monitor rather then trying to find it again and again.

=== Tests ===
AP Tests

[Tim Penhey (thumper)]

Why is it called target_monitor for hud but ideal_monitor for the dash?

Could we get some consistency there?

review: Needs Fixing

[Tim Penhey (thumper)]

The rest of the code looks good.

[Tim Penhey (thumper)]

Thanks.

review: Approve

[jenkins (martin-mrazik+qa)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-autolanding/15/

review: Needs Fixing (continuous-integration)

[Unity Merger (unity-merger)]

Attempt to merge into lp:unity failed due to conflicts:

text conflict in tests/autopilot/unity/tests/test_hud.py

=== modified file 'dash/DashController.cpp'
--- dash/DashController.cpp	2012-08-25 03:17:58 +0000
+++ dash/DashController.cpp	2012-09-07 20:06:22 +0000
@@ -171,7 +171,9 @@
 {
   UScreen *uscreen = UScreen::GetDefault();
   int primary_monitor;
-  if (use_primary)
+  if (visible_)
+    primary_monitor = monitor_;
+  else if (use_primary)
     primary_monitor = uscreen->GetPrimaryMonitor();
   else
     primary_monitor = uscreen->GetMonitorWithMouse();
@@ -259,10 +261,12 @@
     return;
   }
 
+  /* GetIdealMonitor must get called before visible_ is set */
+  monitor_ = GetIdealMonitor();
+
   // The launcher must receive UBUS_OVERLAY_SHOW before window_->EnableInputWindow().
   // Other wise the Launcher gets focus for X, which causes XIM to fail.
   sources_.AddIdle([this] {
-    monitor_ = GetIdealMonitor();
     GVariant* info = g_variant_new(UBUS_OVERLAY_FORMAT_STRING, "dash", TRUE, monitor_);
     ubus_manager_.SendMessage(UBUS_OVERLAY_SHOWN, info);
     return false;
@@ -369,6 +373,7 @@
 void Controller::AddProperties(GVariantBuilder* builder)
 {
   variant::BuilderWrapper(builder).add("visible", visible_)
+                                  .add("ideal_monitor", GetIdealMonitor())
                                   .add("monitor", monitor_);
 }
 

=== modified file 'dash/DashView.cpp'
--- dash/DashView.cpp	2012-09-05 09:21:07 +0000
+++ dash/DashView.cpp	2012-09-07 20:06:22 +0000
@@ -407,22 +407,22 @@
 
   if (IsFullRedraw())
     nux::GetPainter().PushBackgroundStack();
-  
+
   if (preview_displaying_)
    preview_container_->ProcessDraw(gfx_context, (!force_draw) ? IsFullRedraw() : force_draw);
   else
     layout_->ProcessDraw(gfx_context, force_draw);
-    
+
   if (IsFullRedraw())
     nux::GetPainter().PopBackgroundStack();
 
   renderer_.DrawInnerCleanup(gfx_context, content_geo_, GetAbsoluteGeometry(), GetGeometry());
 }
 
-  void DashView::OnMouseButtonDown(int x, int y, unsigned long button, unsigned long key)
-  {
-    dash::Style& style = dash::Style::Instance();
-    nux::Geometry geo(content_geo_);
+void DashView::OnMouseButtonDown(int x, int y, unsigned long button, unsigned long key)
+{
+  dash::Style& style = dash::Style::Instance();
+  nux::Geometry geo(content_geo_);
 
   if (Settings::Instance().GetFormFactor() == FormFactor::DESKTOP)
   {

=== modified file 'hud/HudController.cpp'
--- hud/HudController.cpp	2012-06-26 02:22:44 +0000
+++ hud/HudController.cpp	2012-09-07 20:06:22 +0000
@@ -122,9 +122,14 @@
   AddChild(view_);
 }
 
-int Controller::GetTargetMonitor()
+int Controller::GetIdealMonitor()
 {
-  return UScreen::GetDefault()->GetMonitorWithMouse();
+  int ideal_monitor;
+  if (visible_)
+    ideal_monitor = monitor_index_;
+  else
+    ideal_monitor = UScreen::GetDefault()->GetMonitorWithMouse();
+  return ideal_monitor;
 }
 
 bool Controller::IsLockedToLauncher(int monitor)
@@ -181,8 +186,8 @@
 
 nux::Geometry Controller::GetIdealWindowGeometry()
 {
-  int target_monitor = GetTargetMonitor();
-  auto monitor_geo = UScreen::GetDefault()->GetMonitorGeometry(target_monitor);
+  int ideal_monitor = GetIdealMonitor();
+  auto monitor_geo = UScreen::GetDefault()->GetMonitorGeometry(ideal_monitor);
 
   // We want to cover as much of the screen as possible to grab any mouse events
   // outside of our window
@@ -192,7 +197,7 @@
                     monitor_geo.width,
                     monitor_geo.height - panel_style.panel_height);
 
-  if (IsLockedToLauncher(target_monitor))
+  if (IsLockedToLauncher(ideal_monitor))
   {
     geo.x += launcher_width;
     geo.width -= launcher_width;
@@ -273,12 +278,12 @@
     return;
   }
 
-  unsigned int target_monitor = GetTargetMonitor();
+  unsigned int ideal_monitor = GetIdealMonitor();
 
-  if (target_monitor != monitor_index_)
+  if (ideal_monitor != monitor_index_)
   {
     Relayout();
-    monitor_index_ = target_monitor;
+    monitor_index_ = ideal_monitor;
   }
 
   view_->ShowEmbeddedIcon(!IsLockedToLauncher(monitor_index_));
@@ -487,6 +492,7 @@
 {
   variant::BuilderWrapper(builder)
     .add(window_ ? window_->GetGeometry() : nux::Geometry())
+    .add("ideal_monitor", GetIdealMonitor())
     .add("visible", visible_)
     .add("hud_monitor", monitor_index_)
     .add("locked_to_launcher", IsLockedToLauncher(monitor_index_));

=== modified file 'hud/HudController.h'
--- hud/HudController.h	2012-06-18 02:57:23 +0000
+++ hud/HudController.h	2012-09-07 20:06:22 +0000
@@ -71,7 +71,7 @@
   void RegisterUBusInterests();
   void SetIcon(std::string const& icon_name);
 
-  int GetTargetMonitor();
+  int GetIdealMonitor();
   bool IsLockedToLauncher(int monitor);
 
   nux::Geometry GetIdealWindowGeometry();

=== modified file 'hud/HudView.cpp'
--- hud/HudView.cpp	2012-09-04 18:15:34 +0000
+++ hud/HudView.cpp	2012-09-07 20:06:22 +0000
@@ -60,6 +60,7 @@
 View::View()
   : AbstractView()
   , button_views_(nullptr)
+  , visible_(false)
   , start_time_(0)
   , last_known_height_(0)
   , current_height_(0)
@@ -350,11 +351,13 @@
 
 void View::AboutToShow()
 {
+  visible_ = true;
   renderer_.AboutToShow();
 }
 
 void View::AboutToHide()
 {
+  visible_ = false;
   renderer_.AboutToHide();
 }
 

=== modified file 'tests/autopilot/unity/emulators/dash.py'
--- tests/autopilot/unity/emulators/dash.py	2012-08-22 13:14:18 +0000
+++ tests/autopilot/unity/emulators/dash.py	2012-09-07 20:06:22 +0000
@@ -75,6 +75,11 @@
         return self.controller.monitor
 
     @property
+    def ideal_monitor(self):
+        """The ideal monitor for the dash to appear on"""
+        return self.controller.ideal_monitor
+
+    @property
     def search_string(self):
         return self.searchbar.search_string
 
@@ -436,7 +441,7 @@
             if nav.direction == 2:
                 return nav
         return None
-    
+
     def get_right_navigator(self):
         """Return the right navigator object"""
         navigators = self.get_children_by_type(PreviewNavigator)
@@ -499,7 +504,7 @@
         """Return the current preview object."""
         return self.content.get_current_preview()
         preview_initiate_count_
-    
+
     @property
     def preview_initiate_count(self):
         """Return the number of initiated previews since opened."""

=== modified file 'tests/autopilot/unity/emulators/hud.py'
--- tests/autopilot/unity/emulators/hud.py	2012-07-12 20:30:50 +0000
+++ tests/autopilot/unity/emulators/hud.py	2012-09-07 20:06:22 +0000
@@ -103,6 +103,11 @@
         return self.controller.hud_monitor
 
     @property
+    def ideal_monitor(self):
+        """The target monitor for the Hud to appear on."""
+        return self.controller.ideal_monitor
+
+    @property
     def geometry(self):
         return (self.controller.x, self.controller.y, self.controller.width, self.controller.height)
 

=== modified file 'tests/autopilot/unity/tests/test_dash.py'
--- tests/autopilot/unity/tests/test_dash.py	2012-08-27 20:15:13 +0000
+++ tests/autopilot/unity/tests/test_dash.py	2012-09-07 20:06:22 +0000
@@ -107,6 +107,22 @@
         self.dash.reveal_application_lens()
         self.assertThat(self.dash.active_lens, Eventually(Equals('applications.lens')))
 
+    def test_dash_stays_on_same_monitor(self):
+        """If the dash is opened, then the mouse is moved to another monitor and
+        the keyboard is used. The Dash must not move to that monitor.
+        """
+
+        if self.screen_geo.get_num_monitors() < 2:
+          self.skip ("This test must be ran with more then 1 monitor.")
+
+        self.dash.ensure_visible()
+        self.addCleanup(self.dash.ensure_hidden)
+
+        self.screen_geo.move_mouse_to_monitor(1)
+        self.keyboard.type("abc")
+
+        self.assertThat(self.dash.ideal_monitor, Eventually(Equals(0)))
+
 
 class DashSearchInputTests(DashTestCase):
     """Test features involving input to the dash search"""
@@ -205,25 +221,25 @@
 
         # lensbar should lose focus after activation.
         self.assertThat(lensbar.focused_lens_icon, Eventually(Equals("")))
-        
+
     def test_focus_returns_to_searchbar(self):
         """This test makes sure that the focus is returned to the searchbar of the newly
         activated lens."""
         self.dash.ensure_visible()
-        
+
         for i in range(self.dash.get_num_rows()):
             self.keyboard.press_and_release("Down")
         self.keyboard.press_and_release("Right")
         lensbar = self.dash.view.get_lensbar()
         focused_icon = lensbar.focused_lens_icon
         self.keyboard.press_and_release("Enter")
-        
+
         self.assertThat(lensbar.active_lens, Eventually(Equals(focused_icon)))
         self.assertThat(lensbar.focused_lens_icon, Eventually(Equals("")))
-        
+
         # Now we make sure if the newly activated lens searchbar have the focus.
         self.keyboard.type("HasFocus")
-        
+
         self.assertThat(self.dash.search_string, Eventually(Equals("HasFocus")))
 
     def test_category_header_keynav(self):
@@ -397,7 +413,7 @@
         self.keyboard.press_and_release("Ctrl+v")
 
         self.assertThat(self.dash.search_string, Eventually(Equals('CutPasteCutPaste')))
-        
+
     def test_middle_click_paste(self):
         """Tests if Middle mouse button pastes into searchbar"""
 
@@ -610,13 +626,13 @@
 
 
 class PreviewInvocationTests(DashTestCase):
-    """Tests that dash previews can be opened and closed in different 
+    """Tests that dash previews can be opened and closed in different
     lenses.
 
     """
-    
+
     def test_app_lens_preview_open_close(self):
-        """Right-clicking on an application lens result must show 
+        """Right-clicking on an application lens result must show
         its preview.
 
         """
@@ -666,7 +682,7 @@
         # of failing.
         if category is None:
             self.skipTest("This lens is probably empty")
-        
+
         results = category.get_results()
 
         result = results[0]
@@ -694,7 +710,7 @@
             category = lens.get_category_by_name("Online")
             if category is None:
                 self.skipTest("This lens is probably empty")
-        
+
         results = category.get_results()
 
         result = results[0]

=== modified file 'tests/autopilot/unity/tests/test_hud.py'
--- tests/autopilot/unity/tests/test_hud.py	2012-09-04 16:34:47 +0000
+++ tests/autopilot/unity/tests/test_hud.py	2012-09-07 20:06:22 +0000
@@ -357,9 +357,25 @@
 
         self.assertThat(self.hud.visible, Eventually(Equals(False)))
 
+    def test_hud_stays_on_same_monitor(self):
+        """If the hud is opened, then the mouse is moved to another monitor and
+        the keyboard is used. The hud must not move to that monitor.
+        """
+
+        if self.screen_geo.get_num_monitors() < 2:
+            self.skip ("This test must be ran with more then 1 monitor.")
+
+        self.hud.ensure_visible()
+        self.addCleanup(self.hud.ensure_hidden)
+
+        self.screen_geo.move_mouse_to_monitor(1)
+        self.keyboard.type("abc")
+
+        self.assertThat(self.hud.ideal_monitor, Eventually(Equals(0)))
+
     def test_mouse_changes_selected_hud_button(self):
         """This tests moves the mouse from the top of the screen to the bottom, this must
-           change the selected button from 1 to 5.
+        change the selected button from 1 to 5.
         """
 
         self.hud.ensure_visible()
@@ -375,7 +391,7 @@
 
     def test_keyboard_steals_focus_from_mouse(self):
         """This tests moves the mouse from the top of the screen to the bottom,
-           then it presses the keyboard up 5 times, this must change the selected button from 5 to 1.
+        then it presses the keyboard up 5 times, this must change the selected button from 5 to 1.
         """
 
         self.hud.ensure_visible()