Merge lp:~brandontschaefer/unity/lp-1215630-fix-v2 into lp:unity

[Brandon Schaefer]

Ignore mouse movements if the mouse starts over a switcher icon. Clicking still works fine, we just wont steal focus from the alt+tab work.

Ignore mouse movements if the mouse starts over a switcher icon. Clicking still works fine, we just wont steal focus from the alt+tab work.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3491
http://jenkins.qa.ubuntu.com/job/unity-ci/330/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/219/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/217/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/218/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-ci/330/rebuild

review: Needs Fixing (continuous-integration)

[Marco Trevisan (Treviño) (3v1n0)]

LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'launcher/SwitcherView.cpp'
--- launcher/SwitcherView.cpp	2013-08-09 17:51:06 +0000
+++ launcher/SwitcherView.cpp	2013-09-05 18:13:04 +0000
@@ -36,9 +36,9 @@
 
 namespace
 {
-  const unsigned int VERTICAL_PADDING = 45;
-  const unsigned int SPREAD_OFFSET = 100;
-  const unsigned int EXTRA_ICON_SPACE = 10;
+  unsigned int const VERTICAL_PADDING = 45;
+  unsigned int const SPREAD_OFFSET = 100;
+  unsigned int const EXTRA_ICON_SPACE = 10;
 }
 
 NUX_IMPLEMENT_OBJECT_TYPE(SwitcherView);
@@ -61,6 +61,7 @@
   , last_icon_selected_(-1)
   , last_detail_icon_selected_(-1)
   , target_sizes_set_(false)
+  , check_mouse_first_time_(true)
 {
   icon_renderer_->pip_style = OVER_TILE;
   icon_renderer_->monitor = monitors::MAX;
@@ -114,6 +115,7 @@
   .add("animation-length", animation_length)
   .add("spread-size", (float)spread_size)
   .add("label", text_view_->GetText())
+  .add("last_icon_selected", last_icon_selected_)
   .add("spread_offset", SPREAD_OFFSET)
   .add("label_visible", text_view_->IsVisible());
 }
@@ -260,6 +262,13 @@
 {
   int icon_index = IconIndexAt(x, y);
 
+  if (check_mouse_first_time_)
+  {
+    last_icon_selected_ = icon_index;
+    check_mouse_first_time_ = false;
+    return;
+  }
+
   if (icon_index >= 0)
   {
     if (icon_index != last_icon_selected_)

=== modified file 'launcher/SwitcherView.h'
--- launcher/SwitcherView.h	2013-08-09 17:51:06 +0000
+++ launcher/SwitcherView.h	2013-09-05 18:13:04 +0000
@@ -150,6 +150,7 @@
   int last_icon_selected_;
   int last_detail_icon_selected_;
   bool target_sizes_set_;
+  bool check_mouse_first_time_;
 
   std::list<ui::RenderArg> last_args_;
   std::list<ui::RenderArg> saved_args_;

=== modified file 'tests/autopilot/unity/emulators/switcher.py'
--- tests/autopilot/unity/emulators/switcher.py	2013-07-17 21:54:34 +0000
+++ tests/autopilot/unity/emulators/switcher.py	2013-09-05 18:13:04 +0000
@@ -234,6 +234,10 @@
 class SwitcherView(UnityIntrospectionObject):
     """An emulator class for interacting with with SwitcherView."""
 
+    def __init__(self, *args, **kwargs):
+        super(SwitcherView, self).__init__(*args, **kwargs)
+        self._mouse = Mouse.create()
+
     @property
     def icon_args(self):
         return self.get_children_by_type(RenderArgs);
@@ -242,6 +246,21 @@
     def detail_icons(self):
         return self.get_children_by_type(LayoutWindow);
 
+    def move_over_icon(self, index):
+        offset = self.spread_offset
+        icon_arg = self.icon_args[index]
+
+        x = icon_arg.logical_center_x + offset
+        y = icon_arg.logical_center_y + offset
+
+        self._mouse.move(x,y)
+
+    def move_over_detail_icon(self, index):
+        offset = self.spread_offset
+        x = self.detail_icons[index].x + offset
+        y = self.detail_icons[index].y + offset
+
+        self._mouse.move(x,y)
 
 class RenderArgs(UnityIntrospectionObject):
   """An emulator class for interacting with the RenderArgs class."""

=== modified file 'tests/autopilot/unity/tests/test_switcher.py'
--- tests/autopilot/unity/tests/test_switcher.py	2013-08-27 21:43:12 +0000
+++ tests/autopilot/unity/tests/test_switcher.py	2013-09-05 18:13:04 +0000
@@ -576,16 +576,49 @@
         self.addCleanup(self.unity.switcher.terminate)
 
         index = self.unity.switcher.selection_index
-        offset = self.unity.switcher.view.spread_offset
-
-        icon_arg = self.unity.switcher.view.icon_args[index]
-        x = icon_arg.logical_center_x + offset
-        y = icon_arg.logical_center_y + offset
-        self.mouse.move(x, y)
+        self.unity.switcher.view.move_over_icon(index);
         self.mouse.click()
 
         self.assertProperty(char_win1, is_focused=True)
 
+    def test_mouse_doesnt_hightlight_icon_if_over_on_start(self):
+        """
+        First start the launcher and move the mosue over position of Text Editor icon,
+        then close the switcher and open it again while moving the mouse a bit.
+        Asserting that the icon does lose focus from Character Map.
+        """
+
+        char_win1, char_win2 = self.start_applications("Character Map", "Text Editor")
+        self.assertVisibleWindowStack([char_win2, char_win1])
+        self.assertProperty(char_win1, is_focused=False)
+
+        self.unity.switcher.initiate()
+        self.addCleanup(self.unity.switcher.terminate)
+
+        mouse_index = self.unity.switcher.selection_index - 1
+
+        self.unity.switcher.view.move_over_icon(mouse_index);
+        # Assert we are over the icon we want to hover over.
+        self.assertThat(self.unity.switcher.view.last_icon_selected, Eventually(Equals(mouse_index)))
+
+        self.addCleanup(self.keybinding, "switcher/cancel")
+
+        self.unity.switcher.terminate()
+        self.unity.switcher.initiate()
+
+        index = self.unity.switcher.selection_index
+
+        pos = self.mouse.position()
+        self.mouse.move(pos[0] + 5, pos[1] + 5)
+
+        # Assert moving the mouse does not change the selection
+        self.assertThat(self.unity.switcher.selection_index, Eventually(Equals(index)))
+
+        # Also nice to know clicking still works, even without selection
+        self.mouse.click()
+
+        self.assertProperty(char_win2, is_focused=True)
+
     def test_mouse_highlights_switcher_deatil_icons_motion(self):
         """
         Gather the cords of all the detail icons, move the mouse through each
@@ -597,15 +630,9 @@
         self.unity.switcher.initiate(SwitcherMode.DETAIL)
         self.addCleanup(self.unity.switcher.terminate)
 
-        offset = self.unity.switcher.view.spread_offset
-        cords = []
-
+        index = 0;
         for icon in self.unity.switcher.view.detail_icons:
-            cords.append((icon.x + offset, icon.y + offset))
-
-        index = 0;
-        for cord in cords:
-          self.mouse.move(cord[0], cord[1])
+          self.unity.switcher.view.move_over_detail_icon(index)
           self.assertThat(index, Equals(self.unity.switcher.detail_selection_index))
           index += 1
 
@@ -621,11 +648,7 @@
         self.unity.switcher.initiate(SwitcherMode.DETAIL)
         self.addCleanup(self.unity.switcher.terminate)
 
-        offset = self.unity.switcher.view.spread_offset
-        x = self.unity.switcher.view.detail_icons[0].x + offset
-        y = self.unity.switcher.view.detail_icons[0].y + offset
-
-        self.mouse.move(x,y)
+        self.unity.switcher.view.move_over_detail_icon(0);
         self.mouse.click()
 
         self.assertProperty(char_win1, is_focused=True)