Merge lp:~thumper/unity/unity.alt-tab-workspaces into lp:unity

[Tim Penhey]

Code correctness fix.
Fixes potential multi-monitor issue with alt-tab getting settings confused.

= Problem description =

We passed an int into a function expecting a bool. This caused the switcher to confuse its settings and act weirdly.

= The fix =

We pass a bool now.

= Test coverage =

Existing tests cover a degree of this behavior. Currently testing does not cover multi-monitor behavior however (which is where this bug showed up). The fix is obvious and the current code is clearly and demonstrably wrong, to the point of passing the wrong type into a function.

A manual test was added for the multi-monitor work.

[Jason Smith (jassmith)]

Needs testing

review: Needs Fixing

[Tim Penhey (thumper)]

Again a manual test describing the expected behaviour should be sufficient.

In what situation with multiple monitors was this getting broken?

review: Needs Information

[Thomi Richards (thomir-deactivatedaccount)]

Looks good with manual test.

review: Approve

=== added file 'manual-tests/Switcher.txt'
--- manual-tests/Switcher.txt	1970-01-01 00:00:00 +0000
+++ manual-tests/Switcher.txt	2012-02-28 03:59:18 +0000
@@ -0,0 +1,18 @@
+Multi-monitor Alt-Tab
+---------------------
+This test only applies for multiple monitor.
+App names here are an example, any apps will do.
+
+#. Start with no apps open (or at least remember what is open where)
+#. Start terminal on workspace 1
+#. Start firefox on workspace 2
+#. Move to workspace 2
+
+Now do the following on both monitors
+
+#. Hold Alt, and press Tab, hold and observe
+#. Release Alt.
+
+Outcomes
+  While alt is held, Firefox should appear in the tab list, and
+  terminal should not

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2012-02-26 00:58:30 +0000
+++ plugins/unityshell/src/unityshell.cpp	2012-02-28 03:59:18 +0000
@@ -1601,9 +1601,7 @@
 
   RaiseInputWindows();
 
-  int show_monitor = (show_mode == switcher::ShowMode::CURRENT_VIEWPORT) ? device : -1;
-
-  auto results = launcher_controller_->GetAltTabIcons(show_monitor);
+  auto results = launcher_controller_->GetAltTabIcons(show_mode == switcher::ShowMode::CURRENT_VIEWPORT);
 
   if (!(results.size() == 1 && results[0]->GetIconType() == AbstractLauncherIcon::IconType::TYPE_BEGIN))
     switcher_controller_->Show(show_mode, switcher::SortMode::FOCUS_ORDER, false, results);