Merge lp:~brandontschaefer/unity/switcher-detail-mode-fix-last-active into lp:unity

[Brandon Schaefer]

The switcher in detail mode will now focus the last active window, instead of the current one. If the current focus window activated the switcher.

=== Problem ===
When going into detail mode the switcher would focus its own window. This means Detail mode would no longer know if the window was currently active. So it would not swap the current window with the last active window.

This also cause detail mode to all of a sudden swap the first and second icon (very annoying)

=== Fix ===
Save the currently active icon type, so when we check if we need to swap icons we know which one it was.

=== Test ===
There is an AP test.

[Christopher Lee (veebers)]

review: Approve

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/965/console reported an error when processing this lp:~brandontschaefer/unity/switcher-detail-mode-fix-last-active branch.
Not merging it.

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/966/console reported an error when processing this lp:~brandontschaefer/unity/switcher-detail-mode-fix-last-active branch.
Not merging it.

=== modified file 'launcher/SwitcherModel.cpp'
--- launcher/SwitcherModel.cpp	2012-06-26 02:22:44 +0000
+++ launcher/SwitcherModel.cpp	2012-07-26 02:08:21 +0000
@@ -42,6 +42,8 @@
   for (auto icon : _inner)
   {
     AddChild(icon.GetPointer());
+    if (icon->GetQuirk(AbstractLauncherIcon::QUIRK_ACTIVE))
+      _last_active_icon = icon;
   }
 }
 
@@ -157,7 +159,7 @@
   std::sort (results.begin (), results.end (), &CompareWindowsByActive);
 
   // swap so we focus the last focused window first
-  if (Selection()->GetQuirk (AbstractLauncherIcon::QUIRK_ACTIVE) && results.size () > 1)
+  if (Selection() == _last_active_icon && results.size () > 1)
     std::swap (results[0], results[1]);
 
   return results;

=== modified file 'launcher/SwitcherModel.h'
--- launcher/SwitcherModel.h	2012-05-31 10:19:43 +0000
+++ launcher/SwitcherModel.h	2012-07-26 02:08:21 +0000
@@ -97,6 +97,8 @@
   Base             _inner;
   unsigned int     _index;
   unsigned int     _last_index;
+
+  launcher::AbstractLauncherIcon::Ptr _last_active_icon;
 };
 
 }

=== modified file 'tests/autopilot/unity/tests/test_switcher.py'
--- tests/autopilot/unity/tests/test_switcher.py	2012-07-11 16:37:21 +0000
+++ tests/autopilot/unity/tests/test_switcher.py	2012-07-26 02:08:21 +0000
@@ -308,6 +308,20 @@
         self.switcher.next_icon()
         self.assertThat(self.switcher.selection_index, Eventually(Equals(0)))
 
+    def test_detail_mode_selects_last_active_window(self):
+        """The active selection in detail mode must be the last focused window.
+        If it was the currently active application type.
+        """
+        calc_win1, calc_win2 = self.start_applications("Calculator", "Calculator")
+        self.assertVisibleWindowStack([calc_win2, calc_win1])
+
+        self.switcher.initiate()
+        self.keyboard.press_and_release(self.initiate_keycode)
+        sleep(0.5)
+        self.switcher.select()
+
+        self.assertProperty(calc_win1, is_focused=True)
+
 
 class SwitcherWorkspaceTests(SwitcherTestCase):
     """Test Switcher behavior with respect to multiple workspaces."""
@@ -339,7 +353,6 @@
         self.workspace.switch_to(2)
         char_map = self.start_app("Character Map")
 
-
         self.switcher.initiate(SwitcherMode.ALL)
         self.addCleanup(self.switcher.terminate)