Merge lp:~3v1n0/unity/quicklist-on-expo.stable into lp:unity/4.0

[Marco Trevisan (Treviño)]

Doing work to fix bug #791810 properly.

When a quicklist is opened when the expo is currently running, we just wait it to be closed, before showing the quicklist itself.

[Tim Penhey (thumper)]

> auto menus = Menus();

I really don't like this idiom. Please provide a meaningful name for the type
std::list<DbusmenuMenuitem*> rather than use auto.

typedef std::list<DbusmenuMenuitem*> MenuList;

MenuList menus = Menus();

> auto win_manager = WindowManager::Default();

Here too. Please lets not abuse auto.

review: Needs Fixing

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

> > auto menus = Menus();
>
> I really don't like this idiom. Please provide a meaningful name for the type
> std::list<DbusmenuMenuitem*> rather than use auto.

Ok, I've reverted the type for this one.

> > auto win_manager = WindowManager::Default();
>
> Here too. Please lets not abuse auto.

I this case I've not removed the auto. I don't think that I'm abusing of it in this case since we're retrieving something that has a very explicit type also reading the right-hand operator...
So I'd keep it here.

[Tim Penhey (thumper)]

OK.

review: Approve

=== added file 'manual-tests/QuicklistOnExpo.txt'
--- manual-tests/QuicklistOnExpo.txt	1970-01-01 00:00:00 +0000
+++ manual-tests/QuicklistOnExpo.txt	2011-12-08 03:52:25 +0000
@@ -0,0 +1,14 @@
+Test Quicklist while on Expo
+============================
+
+This test shows how the launcher quicklists work when the expo plugin is activated.
+
+#. Start with a clear screen
+#. Press Super+S or select the workspace switcher on the launcher
+#. When the workspace switcher is running, right-click over a launcher icon
+
+Outcome
+  The expo should terminate, and the quicklist should be shown once the
+  workspace switcher has been closed.
+  Clicking over a quicklist item should work as expected and clicking outside
+  that quicklist, should close it.

=== modified file 'plugins/unityshell/src/LauncherIcon.cpp'
--- plugins/unityshell/src/LauncherIcon.cpp	2011-09-27 18:16:32 +0000
+++ plugins/unityshell/src/LauncherIcon.cpp	2011-12-08 03:52:25 +0000
@@ -531,26 +531,21 @@
 
 bool LauncherIcon::OpenQuicklist(bool default_to_first_item)
 {
-  if (_tooltip_delay_handle)
-    g_source_remove(_tooltip_delay_handle);
-  _tooltip_delay_handle = 0;
-  _skip_tooltip_delay = false;
-
-  _tooltip->ShowWindow(false);
-  _quicklist->RemoveAllMenuItem();
-
   std::list<DbusmenuMenuitem*> menus = Menus();
+
   if (menus.empty())
     return false;
 
-  if (WindowManager::Default()->IsScaleActive())
-    WindowManager::Default()->TerminateScale();
-
-  std::list<DbusmenuMenuitem*>::iterator it;
-  for (it = menus.begin(); it != menus.end(); it++)
+  if (_tooltip_delay_handle)
+    g_source_remove(_tooltip_delay_handle);
+  _tooltip_delay_handle = 0;
+  _skip_tooltip_delay = false;
+
+  _tooltip->ShowWindow(false);
+  _quicklist->RemoveAllMenuItem();
+
+  for (auto menu_item : menus)
   {
-    DbusmenuMenuitem* menu_item = *it;
-
     const gchar* type = dbusmenu_menuitem_property_get(menu_item, DBUSMENU_MENUITEM_PROP_TYPE);
     const gchar* toggle_type = dbusmenu_menuitem_property_get(menu_item, DBUSMENU_MENUITEM_PROP_TOGGLE_TYPE);
     gboolean prop_visible = dbusmenu_menuitem_property_get_bool(menu_item, DBUSMENU_MENUITEM_PROP_VISIBLE);
@@ -596,7 +591,25 @@
     tip_x = 0;
     tip_y = _center.y;
   }
-  QuicklistManager::Default()->ShowQuicklist(_quicklist, tip_x, tip_y);
+
+  auto win_manager = WindowManager::Default();
+
+  if (win_manager->IsScaleActive())
+    win_manager->TerminateScale();
+
+  /* If the expo plugin is active, we need to wait it to be termated, before
+   * shwing the icon quicklist. */
+  if (win_manager->IsExpoActive())
+  {
+    on_expo_terminated_connection = win_manager->terminate_expo.connect([&]() {
+        QuicklistManager::Default()->ShowQuicklist(_quicklist, tip_x, tip_y);
+        on_expo_terminated_connection.disconnect();
+    });
+  }
+  else
+  {
+    QuicklistManager::Default()->ShowQuicklist(_quicklist, tip_x, tip_y);
+  }
 
   return true;
 }

=== modified file 'plugins/unityshell/src/LauncherIcon.h'
--- plugins/unityshell/src/LauncherIcon.h	2011-09-28 21:46:40 +0000
+++ plugins/unityshell/src/LauncherIcon.h	2011-12-08 03:52:25 +0000
@@ -190,6 +190,7 @@
   sigc::connection on_icon_added_connection;
   sigc::connection on_icon_removed_connection;
   sigc::connection on_order_changed_connection;
+  sigc::connection on_expo_terminated_connection;
 
 protected:
   const gchar* GetName();