Merge lp:~3v1n0/unity/fix-783434 into lp:unity

[Marco Trevisan (Treviño)]

Fixing bug #783434 as requested by specs.

[Jason Smith (jassmith)]

+1 This code needs more work but this is good progress

review: Approve

[Neil J. Patel (njpatel)]

review: Approve

[Marco Trevisan (Treviño) (3v1n0)]

Yes, there's more in lp:~3v1n0/unity/fix-688117, but I've not asked for merge yet (also because due to compiz the fix won't cover all the cases).

=== modified file 'plugins/unityshell/src/BamfLauncherIcon.cpp'
--- plugins/unityshell/src/BamfLauncherIcon.cpp	2011-07-21 14:59:25 +0000
+++ plugins/unityshell/src/BamfLauncherIcon.cpp	2011-07-28 20:32:25 +0000
@@ -389,6 +389,7 @@
   BamfView* view;
   bool any_urgent = false;
   bool any_on_current = false;
+  bool any_mapped = false;
 
   children = bamf_view_get_children(BAMF_VIEW(m_App));
 
@@ -423,27 +424,33 @@
 
   /* sort the list */
   CompWindowList tmp;
-  CompWindowList::iterator it;
-  for (it = m_Screen->windows().begin(); it != m_Screen->windows().end(); it++)
+  for (CompWindow* &win : m_Screen->windows())
   {
-    if (std::find(windows.begin(), windows.end(), *it) != windows.end())
-      tmp.push_back(*it);
+    if (std::find(windows.begin(), windows.end(), win) != windows.end())
+      tmp.push_back(win);
   }
   windows = tmp;
 
   /* filter based on workspace */
-  for (it = windows.begin(); it != windows.end(); it++)
+  for (CompWindow* &win : windows)
   {
-    if ((*it)->defaultViewport() == m_Screen->vp())
+    if (win->defaultViewport() == m_Screen->vp())
     {
       any_on_current = true;
+    }
+
+    if (!win->minimized())
+    {
+      any_mapped = true;
+    }
+
+    if (any_on_current && any_mapped)
       break;
-    }
   }
 
   if (any_urgent)
   {
-    // we cant use the compiz tracking since it is currently broken
+    // FIXME we cant use the compiz tracking since it is currently broken
     /*for (it = windows.begin (); it != windows.end (); it++)
     {
       if ((*it)->state () & CompWindowStateDemandsAttentionMask)
@@ -472,11 +479,12 @@
   }
   else if (any_on_current)
   {
-    for (it = windows.begin(); it != windows.end(); it++)
+    for (CompWindow* &win : windows)
     {
-      if ((*it)->defaultViewport() == m_Screen->vp())
+      if (win->defaultViewport() == m_Screen->vp() &&
+          ((any_mapped && !win->minimized()) || !any_mapped))
       {
-        (*it)->activate();
+        win->activate();
       }
     }
   }