Merge lp:~jassmith/unity/unity.fix-alt-tab-mm-confusion into lp:unity

[Jason Smith]

= The Problem =
Alt-tab would get stuck in detail mode when two windows on different monitors were open

= The Fix =
Don't leak the DetailXids() abstraction from the SwitcherModel. The assumed internal implementation changed, breaking SwitcherController

= Testing =
None yet

[Jason Smith (jassmith)]

Doesn't contain tests

review: Needs Fixing

[Tim Penhey (thumper)]

Lets start with a manual test with detailed description of how to set up the environment.

From there we'll work to make a simple AP test.

=== modified file 'plugins/unityshell/src/SwitcherController.cpp'
--- plugins/unityshell/src/SwitcherController.cpp	2012-02-22 09:24:24 +0000
+++ plugins/unityshell/src/SwitcherController.cpp	2012-02-22 09:24:24 +0000
@@ -265,7 +265,7 @@
     switch (detail_mode_)
     {
       case TAB_NEXT_WINDOW:
-        if (model_->detail_selection_index < model_->Selection()->Windows().size () - 1)
+        if (model_->detail_selection_index < model_->DetailXids().size () - 1)
           model_->NextDetail();
         else
           model_->Next();
@@ -320,7 +320,7 @@
 
 void Controller::SetDetail(bool value, unsigned int min_windows)
 {
-  if (value && model_->Selection()->Windows().size () >= min_windows)
+  if (value && model_->DetailXids().size () >= min_windows)
   {
     model_->detail_selection = true;
     detail_mode_ = TAB_NEXT_WINDOW;

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2012-02-18 11:47:22 +0000
+++ plugins/unityshell/src/unityshell.cpp	2012-02-22 09:24:24 +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);