Merge lp:~didrocks/unity/fix-709178 into lp:unity

[Didier Roche-Tolomelli]

hide the launcher after an action without triggering another action. (LP:
#709178)

[Jason Smith (jassmith)]

+1 merging since you are in FOSDEM, enjoy yourself :)

review: Approve

=== modified file 'src/BamfLauncherIcon.cpp'
--- src/BamfLauncherIcon.cpp	2011-02-03 17:31:47 +0000
+++ src/BamfLauncherIcon.cpp	2011-02-07 08:24:28 +0000
@@ -25,6 +25,9 @@
 #include "PluginAdapter.h"
 #include "FavoriteStore.h"
 
+#include "ubus-server.h"
+#include "UBusMessages.h"
+
 #include <glib/gi18n-lib.h>
 #include <gio/gdesktopappinfo.h>
 #include <libindicator/indicator-desktop-shortcuts.h>
@@ -394,6 +397,7 @@
     return;
 
   Activate ();
+  ubus_server_send_message (ubus_server_get_default (), UBUS_LAUNCHER_ACTION_DONE, NULL);
 }
 
 void
 
=== modified file 'src/Launcher.cpp'
--- src/Launcher.cpp	2011-02-03 20:19:33 +0000
+++ src/Launcher.cpp	2011-02-07 08:24:28 +0000
@@ -289,6 +289,7 @@
     _key_show_launcher      = false;
     _placeview_show_launcher = false;
     _window_over_launcher   = false;
+    _hide_on_action_done    = false;
     _render_drag_window     = false;
     _backlight_always_on    = false;
     _last_button_press      = 0;
@@ -323,6 +324,10 @@
     ubus_server_register_interest (ubus, UBUS_HOME_BUTTON_TRIGGER_UPDATE,
                                    (UBusCallback)&Launcher::OnTriggerUpdate,
                                    this);
+                                   
+    ubus_server_register_interest (ubus, UBUS_LAUNCHER_ACTION_DONE,
+                                   (UBusCallback)&Launcher::OnActionDone,
+                                   this);
 }
 
 Launcher::~Launcher()
@@ -1032,25 +1037,22 @@
 {
     _key_show_launcher = true;
     EnsureHiddenState ();
-    // trigger the timer now as we want to hide the launcher immediately
-    // if we release the key after 1s happened.
-    SetupAutohideTimer ();
 }
 
 void Launcher::EndKeyShowLauncher ()
 {
     _key_show_launcher = false;
-    EnsureHiddenState ();
+    if (_hide_on_action_done)
+      EnsureHiddenState ();
+    else
+      SetupAutohideTimer ();
 }
 
 void Launcher::OnPlaceViewShown (GVariant *data, void *val)
 {
     Launcher *self = (Launcher*)val;
     self->_placeview_show_launcher = true;
-    // trigger the timer now as we want to hide the launcher immediately
-    // if we close the dash after 1s happened.
     self->EnsureHiddenState ();
-    self->SetupAutohideTimer ();
 }
 
 void Launcher::OnPlaceViewHidden (GVariant *data, void *val)
@@ -1096,6 +1098,13 @@
   }
 }
 
+void Launcher::OnActionDone (GVariant *data, void *val)
+{
+    Launcher *self = (Launcher*)val;
+    self->_hide_on_action_done = true;
+    self->SetupAutohideTimer ();
+}
+
 void Launcher::SetHidden (bool hidden)
 {
     if (hidden == _hidden)
@@ -1122,7 +1131,8 @@
 Launcher::EnsureHiddenState ()
 {
   if (!_mouse_inside_trigger && 
-      !_mouse_inside_launcher && 
+      (!_mouse_inside_launcher ||
+       (_mouse_inside_launcher && _hide_on_action_done)) && 
       !_key_show_launcher &&
       !_placeview_show_launcher &&
        _launcher_action_state == ACTION_NONE &&
@@ -2244,6 +2254,8 @@
     launcher_icon->MouseEnter.emit ();
     launcher_icon->_mouse_inside = true;
     _icon_under_mouse = launcher_icon;
+    // reset trigger has the mouse moved to another item
+    _hide_on_action_done = false;
   }
 }
 
 
=== modified file 'src/Launcher.h'
--- src/Launcher.h	2011-02-03 17:31:47 +0000
+++ src/Launcher.h	2011-02-07 08:24:28 +0000
@@ -238,6 +238,8 @@
   
   static void OnTriggerUpdate (GVariant *data, gpointer user_data);
 
+  static void OnActionDone (GVariant *data, void *val);
+
   void RenderIndicators (nux::GraphicsEngine& GfxContext,
                          RenderArg const &arg,
                          int running,
@@ -306,6 +308,7 @@
   bool  _key_show_launcher;
   bool  _placeview_show_launcher;
   bool  _window_over_launcher;
+  bool  _hide_on_action_done;
   bool  _render_drag_window;
   bool  _backlight_always_on;
 
 
=== modified file 'src/UBusMessages.h'
--- src/UBusMessages.h	2011-02-03 17:31:47 +0000
+++ src/UBusMessages.h	2011-02-07 08:24:28 +0000
@@ -42,4 +42,7 @@
 #define UBUS_LAUNCHER_EXIT_KEY_NAV "LAUNCHER_EXIT_KEY_NAV"
 #define UBUS_QUICKLIST_EXIT_KEY_NAV "QUICKLIST_EXIT_KEY_NAV"
 
+// Signal to send on icon action and that you want to request hiding the launcher
+#define UBUS_LAUNCHER_ACTION_DONE "LAUNCHER_ACTION_DONE"
+
 #endif // UBUS_MESSAGES_H