Merge lp:~townsend/unity/fix-workspace-alt-tab into lp:unity

[Christopher Townsend]

Fix issue where the same app on different workspaces would not allow alt-tab to work properly when trying to switch to the last used app on the same workspace.

= Issue =
The same application opened on different workspaces will cause a problem when trying to alt-tab to the last used application on a particular workspace. See bug #1211261 on how to reproduce.

= Fix =
The SelectFirstItem() function the Switcher Controller code did not take into account that windows may not be in the same workspace. The fix adds logic to check if the ShowMode is Viewport only and if the window is not on the current desktop.

= Test =
Added an AP test to simulate the reproduction steps.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3465
http://jenkins.qa.ubuntu.com/job/unity-ci/302/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/191
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/189
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/190

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-autolanding/226/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/generic-cleanup-mbs/1467
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-autolanding/182
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-autolanding/182/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-autolanding/182

review: Needs Fixing (continuous-integration)

[Christopher Townsend (townsend)]

Hmm, strange that the armhf failure occurred. I thought Marco fixed that test issue. Let's try to re-approve and see if it works this time.

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'launcher/SwitcherController.cpp'
--- launcher/SwitcherController.cpp	2013-08-09 17:51:06 +0000
+++ launcher/SwitcherController.cpp	2013-08-13 20:34:09 +0000
@@ -764,6 +764,10 @@
   for (auto& window : first->Windows())
   {
     Window xid = window->window_id();
+    
+    if (model_->only_detail_on_viewport && !wm.IsWindowOnCurrentDesktop(xid))
+      continue;
+
     uint64_t num = wm.GetWindowActiveNumber(xid);
 
     if (num > first_highest)

=== modified file 'tests/autopilot/unity/tests/test_switcher.py'
--- tests/autopilot/unity/tests/test_switcher.py	2013-07-18 17:34:01 +0000
+++ tests/autopilot/unity/tests/test_switcher.py	2013-08-13 20:34:09 +0000
@@ -453,6 +453,24 @@
         self.assertThat(get_icon_names, Eventually(Contains(char_map.name)))
         self.assertThat(get_icon_names, Eventually(Not(Contains(calc.name))))
 
+    def test_switcher_switch_current_workspace_same_apps_diff_workspace(self):
+        initial_workspace = self.workspace.current_workspace
+        self.addCleanup(self.workspace.switch_to, initial_workspace)
+
+        char_map = self.process_manager.start_app_window("Character Map")
+        calc1 = self.process_manager.start_app_window("Calculator")
+
+        self.workspace.switch_to((initial_workspace + 1) % self.workspace.num_workspaces)
+
+        calc2 = self.process_manager.start_app_window("Calculator")
+
+        self.workspace.switch_to(initial_workspace);
+
+        self.unity.switcher.initiate()
+        self.unity.switcher.select()
+
+        self.assertProperty(char_map, is_focused=True)
+
     def test_switcher_all_mode_shows_all_apps(self):
         """Test switcher 'show_all' mode shows apps from all workspaces."""
         initial_workspace = self.workspace.current_workspace