Merge lp:~timo-jyrinki/unity/alt-grave-ordering-fix-6.0 into lp:unity/6.0

[Timo Jyrinki]

Changes the swapping order of the detail mode. Now the currently active window gets moved to the end, instead of getting swapped with the last used window. (LP: #1061229)

(from https://code.launchpad.net/~brandontschaefer/unity/alt-grave-ordering-fix/+merge/128823)

=== Problem ===
When pressing Alt+grave twice it would focus the active window going into detail mode. It should focus the third window, not the first.

=== Fix ===
Instead of swapping the first and second window, move the first all the way to the end (it being a vector means moving everything over one left)

=== Test ===
AP test

So with this change:

Window order, where 1 is the current focused window:
1,2,3,4,5,6

Pressing Alt+`

Desired result order:
2,3,4,5,6,1

Current result order:
2,1,3,4,5,6

[Brandon Schaefer (brandontschaefer)]

Looks good.

review: Approve

=== modified file 'launcher/SwitcherModel.cpp'
--- launcher/SwitcherModel.cpp	2012-08-02 11:30:02 +0000
+++ launcher/SwitcherModel.cpp	2012-10-12 13:02:20 +0000
@@ -158,9 +158,13 @@
 
   std::sort (results.begin (), results.end (), &CompareWindowsByActive);
 
-  // swap so we focus the last focused window first
   if (Selection() == _last_active_icon && results.size () > 1)
-    std::swap (results[0], results[1]);
+  {
+    for (unsigned int i = 0; i < results.size()-1; i++)
+    {
+      std::swap (results[i], results[i+1]);
+    }
+  }
 
   return results;
 }
 
=== modified file 'tests/autopilot/unity/tests/test_switcher.py'
--- tests/autopilot/unity/tests/test_switcher.py	2012-09-17 10:37:02 +0000
+++ tests/autopilot/unity/tests/test_switcher.py	2012-10-12 13:02:20 +0000
@@ -350,6 +350,19 @@
 
         self.assertProperty(char_win1, is_focused=True)
 
+    def test_detail_mode_selects_third_window(self):
+        """Pressing Alt+` twice must select the third last used window.
+        LP:1061229
+        """
+        char_win1, char_win2, char_win3 = self.start_applications("Character Map", "Character Map", "Character Map")
+        self.assertVisibleWindowStack([char_win3, char_win2, char_win1])
+
+        self.switcher.initiate(SwitcherMode.DETAIL)
+        self.switcher.next_detail()
+
+        self.switcher.select()
+        self.assertVisibleWindowStack([char_win1, char_win3, char_win2])
+
 
 class SwitcherWorkspaceTests(SwitcherTestCase):
     """Test Switcher behavior with respect to multiple workspaces."""
 
=== modified file 'tests/test_switcher_model.cpp'
--- tests/test_switcher_model.cpp	2012-03-14 06:24:18 +0000
+++ tests/test_switcher_model.cpp	2012-10-12 13:02:20 +0000
@@ -100,4 +100,37 @@
   EXPECT_EQ(model->LastSelection(), third);
 }
 
+TEST(TestSwitcherModel, TestActiveDetailWindowSort)
+{
+  std::vector<AbstractLauncherIcon::Ptr> detail_icons;
+  AbstractLauncherIcon::Ptr detail(new MockLauncherIcon());
+  detail->SetQuirk(AbstractLauncherIcon::Quirk::ACTIVE, true);
+  detail_icons.push_back(detail);
+
+  // Set up a list with out an active icon, so we can assert
+  // the first detail icon == to the last xid of detailed list
+  std::vector<AbstractLauncherIcon::Ptr> icons;
+  AbstractLauncherIcon::Ptr normal(new MockLauncherIcon());
+  icons.push_back(normal);
+
+  SwitcherModel::Ptr model_detail_active(new SwitcherModel(detail_icons));
+  model_detail_active->detail_selection = true;
+
+  SwitcherModel::Ptr model_detail(new SwitcherModel(icons));
+  model_detail->detail_selection = true;
+
+  EXPECT_TRUE(model_detail_active->DetailXids().size() > 2);
+  EXPECT_TRUE(model_detail_active->DetailSelectionWindow() != model_detail->DetailSelectionWindow());
+
+  // Move to the last detailed window
+  for (unsigned int i = 0; i < model_detail_active->DetailXids().size() - 1; i++)
+    model_detail_active->NextDetail();
+
+  Window sorted, unsorted;
+  sorted = model_detail_active->DetailSelectionWindow();
+  unsorted = model_detail->DetailSelectionWindow();
+
+  EXPECT_EQ(sorted, unsorted);
+}
+
 }