Merge lp:~3v1n0/unity/fix-690143-v2 into lp:unity

[Marco Trevisan (Treviño)]

Improve the fix for the bug #690143

With the current code if you switch viewport of a window using the alt+space window decoration controls, then the launcher icon won't update its indicator to show if the windows are or not in the current viewport.

This patch fixes this issue.

=== modified file 'plugins/unityshell/src/BamfLauncherIcon.cpp'
--- plugins/unityshell/src/BamfLauncherIcon.cpp	2011-09-27 03:41:15 +0000
+++ plugins/unityshell/src/BamfLauncherIcon.cpp	2011-09-28 23:23:17 +0000
@@ -140,6 +140,7 @@
   _launcher = IconManager;
   _menu_desktop_shortcuts = NULL;
   _on_desktop_file_changed_handler_id = 0;
+  _window_moved_id = 0;
   char* icon_name = bamf_view_get_icon(BAMF_VIEW(m_App));
 
   tooltip_text = BamfName();
@@ -172,6 +173,7 @@
   UpdateDesktopFile();
 
   WindowManager::Default()->window_minimized.connect(sigc::mem_fun(this, &BamfLauncherIcon::OnWindowMinimized));
+  WindowManager::Default()->window_moved.connect(sigc::mem_fun(this, &BamfLauncherIcon::OnWindowMoved));
   WindowManager::Default()->compiz_screen_viewport_switch_ended.connect(sigc::mem_fun(this, &BamfLauncherIcon::OnViewPortSwitchEnded));
   WindowManager::Default()->terminate_expo.connect(sigc::mem_fun(this, &BamfLauncherIcon::OnViewPortSwitchEnded));
   IconManager->hidden_changed.connect(sigc::mem_fun(this, &BamfLauncherIcon::OnLauncherHiddenChanged));
@@ -302,10 +304,12 @@
   UpdateQuirkTimeDelayed(300, QUIRK_SHIMMER);
 }
 
-void BamfLauncherIcon::OnViewPortSwitchEnded()
+gboolean BamfLauncherIcon::OnWindowMovedTimeout(BamfLauncherIcon* self)
 {
+  GList *children = bamf_view_get_children(BAMF_VIEW(self->m_App));
+
   bool any_on_current = false;
-  GList *children = bamf_view_get_children(BAMF_VIEW(m_App));
+  bool found_moved = (self->_window_moved_xid != 0 ? false : true);
 
   for (GList *l = children; l; l = l->next)
   {
@@ -314,17 +318,46 @@
     if (BAMF_IS_WINDOW(view))
     {
       Window xid = bamf_window_get_xid(BAMF_WINDOW(view));
+
+      if (self->_window_moved_xid == xid)
+        found_moved = true;
+      
       if (WindowManager::Default()->IsWindowOnCurrentDesktop(xid))
-      {
         any_on_current = true;
+
+      if (found_moved && any_on_current)
         break;
-      }
     }
   }
 
-  SetHasWindowOnViewport(any_on_current);
-
+  self->SetHasWindowOnViewport(any_on_current);
+  self->_window_moved_id = 0;
   g_list_free(children);
+
+  return FALSE;
+}
+
+void BamfLauncherIcon::OnWindowMoved(guint32 moved_win)
+{
+  if (_window_moved_id != 0)
+    g_source_remove(_window_moved_id);
+
+  _window_moved_xid = moved_win;
+
+  if (_window_moved_xid == 0)
+  {
+    OnWindowMovedTimeout(this);
+  }
+  else
+  {
+    _window_moved_id = g_timeout_add(250,
+                      (GSourceFunc)BamfLauncherIcon::OnWindowMovedTimeout, this);
+  }
+}
+
+void BamfLauncherIcon::OnViewPortSwitchEnded()
+{
+  OnWindowMoved(0);
 }
 
 bool BamfLauncherIcon::IsSticky()

=== modified file 'plugins/unityshell/src/BamfLauncherIcon.h'
--- plugins/unityshell/src/BamfLauncherIcon.h	2011-09-28 21:46:40 +0000
+++ plugins/unityshell/src/BamfLauncherIcon.h	2011-09-28 23:23:17 +0000
@@ -99,6 +99,8 @@
   std::set<std::string> _supported_types;
   bool _supported_types_filled;
   guint _fill_supported_types_id;
+  guint32 _window_moved_id;
+  guint32 _window_moved_xid;
 
   void EnsureWindowState();
 
@@ -113,6 +115,7 @@
   void EnsureMenuItemsReady();
 
   void OnWindowMinimized(guint32 xid);
+  void OnWindowMoved(guint32 xid);
   void OnViewPortSwitchEnded();
   bool OwnsWindow(Window w);
   
@@ -138,7 +141,7 @@
 
   static gboolean OnDndHoveredTimeout(gpointer data);
   static gboolean FillSupportedTypes(gpointer data);
+  static gboolean OnWindowMovedTimeout(BamfLauncherIcon *self);
 };
 
 #endif // BAMFLAUNCHERICON_H
-