Merge lp:~jassmith/unity/unity.fix-alt-tab-to-minimized into lp:unity

[Jason Smith]

= The Problem =

See: https://bugs.launchpad.net/unity/+bug/933397

= The Fix =

Check if there are any mapped windows on the current workspace only when deciding what to focus

= Testing =

None yet

[Jason Smith (jassmith)]

No tests

review: Needs Fixing

[Tim Penhey (thumper)]

Please add a manual test for this. We can then work to make an AP test from it. Often it is hard to work out what AP methods we want until we have a more definitive test defined.

review: Needs Fixing

=== modified file 'plugins/unityshell/src/PluginAdapter.cpp'
--- plugins/unityshell/src/PluginAdapter.cpp	2012-02-07 10:59:23 +0000
+++ plugins/unityshell/src/PluginAdapter.cpp	2012-02-22 10:01:20 +0000
@@ -579,6 +579,7 @@
   CompWindow* top_window_on_monitor = NULL;
   bool any_on_current = false;
   bool any_mapped = false;
+  bool any_mapped_on_current = false;
   bool forced_unminimize = false;
 
   /* sort the list */
@@ -596,6 +597,11 @@
     if (win->defaultViewport() == m_Screen->vp())
     {
       any_on_current = true;
+
+      if (!win->minimized())
+      {
+        any_mapped_on_current = true;
+      }
     }
 
     if (!win->minimized())
@@ -644,7 +650,7 @@
          if (!is_mapped)
            win->raise ();
        }
-       else if ((any_mapped && !win->minimized()) || !any_mapped)
+       else if ((any_mapped_on_current && !win->minimized()) || !any_mapped_on_current)
        {
          if (!forced_unminimize || target_vp == m_Screen->vp())
          {