Merge lp:~vanvugt/unity/fix-773892 into lp:unity

[Daniel van Vugt]

Keep dash open while dragging apps into the launcher (LP: #773892)

Keep dash open while dragging apps into the launcher (LP: #773892)

Old behaviour: The dash closes as soon as you start dragging any icon from the dash.

New behaviour: The dash stays open if you're dragging an application icon. This allows you to quickly drag several apps into the launcher. If it's not an app (usually a file) then the dash reverts to the old behaviour and closes as soon as you start dragging.

I think the new behaviour makes for a much more pleasant, and less frustrating, user experience.

IMPORTANT NOTE: This fix exposes Nux bug 805874. Ideally you should have the fix for bug 805874 (merge pending) before testing this fix. Otherwise it will look buggy.

[Gord Allott (gordallott)]

Waiting for the nux branch

review: Abstain

[Daniel van Vugt (vanvugt)]

Judging by Jay's comments, it sounds like the fix for nux bug 805874 won't be merged at all because it will be superseded. We may be waiting forever... ?

[Gord Allott (gordallott)]

once the new input refactoring branch lands in Nux I'll take another look at this branch and see if it works without the bug you mentioned, its on my to do list don't worry :) if it doesn't work after that lands I'll let you know

[Daniel van Vugt (vanvugt)]

Jay says the new nux event architecture is released. Oneiric may not need a fix for bug 805874 any more. Please test this fix again...

[Gord Allott (gordallott)]

lots of conflicts with trunk, so trying to merge in trunk with it failed more than i am comfortable with, so needs the conflicts fixing

review: Needs Fixing

[Daniel van Vugt (vanvugt)]

Yes I noticed the extensive style and clean-up changes that happened in lp:unity recently. While it's great in theory it has caused me a bit a grief with conflicts. But such conflicts are hopefully only once-off.

I'll revisit and rebase this fix soon.

[Daniel van Vugt (vanvugt)]

Conflicts resolved.

=== modified file 'plugins/unityshell/src/Launcher.cpp'
--- plugins/unityshell/src/Launcher.cpp	2011-08-01 16:20:08 +0000
+++ plugins/unityshell/src/Launcher.cpp	2011-08-02 06:24:40 +0000
@@ -303,10 +303,20 @@
                                                    (UBusCallback) &Launcher::OnBFBDndEnter,
                                                    this);
 
-  _ubus_handles[5] = ubus_server_register_interest (ubus,
-                                                    UBUS_BACKGROUND_COLOR_CHANGED,
-                                                    (UBusCallback) &Launcher::OnBGColorChanged,
-                                                    this);
+  _ubus_handles[5] = ubus_server_register_interest(ubus,
+                                                   UBUS_BACKGROUND_COLOR_CHANGED,
+                                                   (UBusCallback) &Launcher::OnBGColorChanged,
+                                                   this);
+
+  _ubus_handles[6] = ubus_server_register_interest(ubus,
+                                                   UBUS_PLACES_APP_DND_STARTED,
+                                                   (UBusCallback) &Launcher::OnPlaceDndStart,
+                                                   this);
+
+  _ubus_handles[7] = ubus_server_register_interest(ubus,
+                                                   UBUS_PLACES_APP_DND_FINISHED,
+                                                   (UBusCallback) &Launcher::OnPlaceDndFinish,
+                                                   this);
 
   _dbus_owner = g_bus_own_name(G_BUS_TYPE_SESSION,
                                S_DBUS_NAME,
@@ -1500,22 +1510,35 @@
   self->NeedRedraw();
 }
 
+void Launcher::Desaturate()
+{
+    LauncherModel::iterator it;
+    // TODO: add in a timeout for seeing the animation (and make it smoother)
+    for (it = _model->begin(); it != _model->end(); it++)
+    {
+      (*it)->SetQuirk(LauncherIcon::QUIRK_DESAT, true);
+      (*it)->HideTooltip();
+    }
+}
+
+void Launcher::Resaturate()
+{
+    LauncherModel::iterator it;
+    // TODO: add in a timeout for seeing the animation (and make it smoother)
+    for (it = _model->begin(); it != _model->end(); it++)
+    {
+      (*it)->SetQuirk(LauncherIcon::QUIRK_DESAT, false);
+    }
+}
+
 void Launcher::OnPlaceViewShown(GVariant* data, void* val)
 {
   Launcher* self = (Launcher*)val;
-  LauncherModel::iterator it;
 
   self->_dash_is_open = true;
   self->_hide_machine->SetQuirk(LauncherHideMachine::PLACES_VISIBLE, true);
   self->_hover_machine->SetQuirk(LauncherHoverMachine::PLACES_VISIBLE, true);
-
-  // TODO: add in a timeout for seeing the animation (and make it smoother)
-  for (it = self->_model->begin(); it != self->_model->end(); it++)
-  {
-    (*it)->SetQuirk(LauncherIcon::QUIRK_DESAT, true);
-    (*it)->HideTooltip();
-  }
-
+  self->Desaturate();
   // hack around issue in nux where leave events dont always come after a grab
   self->SetStateMouseOverBFB(false);
 }
@@ -1523,7 +1546,6 @@
 void Launcher::OnPlaceViewHidden(GVariant* data, void* val)
 {
   Launcher* self = (Launcher*)val;
-  LauncherModel::iterator it;
 
   self->_dash_is_open = false;
   self->_hide_machine->SetQuirk(LauncherHideMachine::PLACES_VISIBLE, false);
@@ -1535,12 +1557,7 @@
 
   self->SetStateMouseOverLauncher(self->GetAbsoluteGeometry().IsInside(pt));
   self->SetStateMouseOverBFB(false);
-
-  // TODO: add in a timeout for seeing the animation (and make it smoother)
-  for (it = self->_model->begin(); it != self->_model->end(); it++)
-  {
-    (*it)->SetQuirk(LauncherIcon::QUIRK_DESAT, false);
-  }
+  self->Resaturate();
 }
 
 void Launcher::OnBFBDndEnter(GVariant* data, gpointer user_data)
@@ -1600,6 +1617,21 @@
   g_variant_iter_free(prop_iter);
 }
 
+void Launcher::OnPlaceDndStart(GVariant *data, void *val)
+{
+  Launcher *self = (Launcher*)val;
+  self->Resaturate();
+}
+
+void Launcher::OnPlaceDndFinish(GVariant *data, void *val)
+{
+  Launcher *self = (Launcher*)val;
+  if (self->_hide_machine->GetQuirk(LauncherHideMachine::PLACES_VISIBLE))
+  {
+    self->Desaturate();
+  }
+}
+
 void Launcher::OnActionDone(GVariant* data, void* val)
 {
   Launcher* self = (Launcher*)val;
 
=== modified file 'plugins/unityshell/src/Launcher.h'
--- plugins/unityshell/src/Launcher.h	2011-08-01 14:58:34 +0000
+++ plugins/unityshell/src/Launcher.h	2011-08-02 06:24:40 +0000
@@ -331,6 +331,9 @@
 
   void OnIconNeedsRedraw(AbstractLauncherIcon* icon);
 
+  void Desaturate();
+  void Resaturate();
+
   static void OnPlaceViewHidden(GVariant* data, void* val);
   static void OnPlaceViewShown(GVariant* data, void* val);
 
@@ -338,6 +341,9 @@
   static void OnBFBDndEnter(GVariant* data, gpointer user_data);
   static void OnBGColorChanged (GVariant *data, void *val);
 
+  static void OnPlaceDndStart(GVariant *data, gpointer user_data);
+  static void OnPlaceDndFinish(GVariant *data, gpointer user_data);
+
   static void OnActionDone(GVariant* data, void* val);
 
   void RenderIconToTexture(nux::GraphicsEngine& GfxContext, LauncherIcon* icon, nux::IntrusiveSP<nux::IOpenGLBaseTexture> texture);
@@ -484,7 +490,7 @@
   GSettings* _settings;
   guint32 _settings_changed_id;
 
-  guint _ubus_handles[6];
+  guint _ubus_handles[8];
 
   nux::Color _background_color;
   bool _dash_is_open;
 
=== modified file 'plugins/unityshell/src/PlacesController.cpp'
--- plugins/unityshell/src/PlacesController.cpp	2011-07-21 14:59:25 +0000
+++ plugins/unityshell/src/PlacesController.cpp	2011-08-02 06:24:40 +0000
@@ -60,6 +60,10 @@
                                                    UBUS_PLACE_VIEW_CLOSE_REQUEST,
                                                    (UBusCallback) &PlacesController::CloseRequest,
                                                    this);
+  _ubus_handles[2] = ubus_server_register_interest(ubus,
+                                                   UBUS_PLACES_APP_DND_FINISHED,
+                                                   (UBusCallback) &PlacesController::DndFinished,
+                                                   this);
 
   _factory = PlaceFactory::GetDefault();
 
@@ -353,6 +357,32 @@
 }
 
 void
+PlacesController::OnDndFinished()
+{
+  if (_visible)
+  {
+    //
+    // We might think we own the pointer grab, but if we just finished DnD
+    // then we probably lost the grab.
+    // That might be a bug in Nux, but it's cleaner to put a workaround here
+    // right now...
+    //
+    if (_window->OwnsPointerGrab())
+    {
+      _window->UnGrabPointer();
+      _window->GrabPointer();
+    }
+  }
+}
+
+void
+PlacesController::DndFinished(GVariant *data, void *val)
+{
+  PlacesController *self = (PlacesController*)val;
+  self->OnDndFinished();
+}
+
+void
 PlacesController::RecvMouseDownOutsideOfView(int x, int y, unsigned long button_flags, unsigned long key_flags)
 {
   if (IsActivationValid())
 
=== modified file 'plugins/unityshell/src/PlacesController.h'
--- plugins/unityshell/src/PlacesController.h	2011-07-21 14:59:25 +0000
+++ plugins/unityshell/src/PlacesController.h	2011-08-02 06:24:40 +0000
@@ -59,9 +59,11 @@
 private:
   static void ExternalActivation(GVariant* data, void* val);
   static void CloseRequest(GVariant* data, void* val);
+  static void DndFinished(GVariant *data, void *val);
   static void WindowConfigureCallback(int WindowWidth, int WindowHeight,
                                       nux::Geometry& geo, void* user_data);
 
+  void OnDndFinished();
   void RecvMouseDownOutsideOfView(int x, int y, unsigned long button_flags, unsigned long key_flags);
   void OnActivePlaceEntryChanged(PlaceEntry* entry);
   void OnSettingsChanged(PlacesSettings* settings);
@@ -92,7 +94,7 @@
 
   bool              _need_show;
 
-  guint             _ubus_handles[2];
+  guint             _ubus_handles[3];
 };
 
 #endif // PLACES_CONTROLLER_H
 
=== modified file 'plugins/unityshell/src/PlacesSimpleTile.cpp'
--- plugins/unityshell/src/PlacesSimpleTile.cpp	2011-07-26 03:49:30 +0000
+++ plugins/unityshell/src/PlacesSimpleTile.cpp	2011-08-02 06:24:40 +0000
@@ -83,9 +83,12 @@
 PlacesSimpleTile::DndSourceDragBegin()
 {
   Reference();
-  ubus_server_send_message(ubus_server_get_default(),
-                           UBUS_PLACE_VIEW_CLOSE_REQUEST,
-                           NULL);
+  const gchar *message;
+  if (_uri && g_str_has_prefix(_uri, "application://"))
+    message = UBUS_PLACES_APP_DND_STARTED;
+  else
+    message = UBUS_PLACE_VIEW_CLOSE_REQUEST;
+  ubus_server_send_message(ubus_server_get_default(), message, NULL);
 }
 
 nux::NBitmapData*
@@ -177,6 +180,12 @@
 void
 PlacesSimpleTile::DndSourceDragFinished(nux::DndAction result)
 {
+  if (_uri && g_str_has_prefix(_uri, "application://"))
+  {
+    ubus_server_send_message(ubus_server_get_default(),
+                             UBUS_PLACES_APP_DND_FINISHED,
+                             NULL);
+  }
   UnReference();
 }
 
 
=== modified file 'plugins/unityshell/src/UBusMessages.h'
--- plugins/unityshell/src/UBusMessages.h	2011-07-29 07:15:54 +0000
+++ plugins/unityshell/src/UBusMessages.h	2011-08-02 06:24:40 +0000
@@ -27,6 +27,10 @@
 
 #define UBUS_HOME_BUTTON_ACTIVATED "PANEL_HOME_ACTIVATED"
 
+// When an app is being dragged (from the Dash)
+#define UBUS_PLACES_APP_DND_STARTED  "PLACES_APP_DND_STARTED"
+#define UBUS_PLACES_APP_DND_FINISHED "PLACES_APP_DND_FINISHED"
+
 #define UBUS_DASH_EXTERNAL_ACTIVATION   "DASH_EXTERNAL_ACTIVATION"
 #define UBUS_HOME_BUTTON_BFB_UPDATE "PANEL_HOME_BUTTON_BFB_UPDATE"
 #define UBUS_HOME_BUTTON_BFB_DND_ENTER "PANEL_HOME_BUTTON_BFB_DND_ENTER"