Merge lp:~brandontschaefer/unity/fix.918753 into lp:unity

[Brandon Schaefer]

* Fixes the icon getting frozen and producing a duplicate icon.

= Problem description =

When a user executed a program from the launcher then draged an icon it the icon would freeze where its at and a duplicate would be put back at its original position.

= The fix =

When a WindowMapped signal gets emitted we check if the the drag icon or drag launcher needs to get reset, if it does then reset it.

= Test coverage =

There is a manual test for this.

[lp:~brandontschaefer/unity/fix.918753]

2131. By Brandon Schaefer on 2012-03-20

* DRY - Dont Repeat Yourself

[Tim Penhey (thumper)]

review: Approve

=== modified file 'manual-tests/Launcher.txt'
--- manual-tests/Launcher.txt	2012-03-05 02:59:03 +0000
+++ manual-tests/Launcher.txt	2012-03-20 23:28:20 +0000
@@ -155,3 +155,17 @@
   icons.
   * When released, the icon "flies" back into the launcher, a spaces opens for
   it, and the any pips for running apps show again.
+
+
+Dragging icon while program is starting
+---------------------------------------
+This test that when a program is executed from the launcher and the icon is 
+getting dragged that the icon doesn't get frozen on the launcher.
+
+#. Click on Ubuntu Software Center from the launcher.
+#. While it's starting drag the Ubuntu Software Center icon.
+#. Drag the icon half over the launcher and desktop.
+#. Wait for the program to start.
+
+Outcome:
+  * The icon should go back to its correct position in the launcher.

=== modified file 'plugins/unityshell/src/Launcher.cpp'
--- plugins/unityshell/src/Launcher.cpp	2012-03-20 10:27:41 +0000
+++ plugins/unityshell/src/Launcher.cpp	2012-03-20 23:28:20 +0000
@@ -1471,6 +1471,9 @@
     if (!_dnd_check_handle)
       _dnd_check_handle = g_timeout_add(200, &Launcher::OnUpdateDragManagerTimeout, this);
   //}
+
+  if (GetActionState() != ACTION_NONE)
+    ResetMouseDragState();
 }
 
 void
@@ -2183,6 +2186,21 @@
   }
 }
 
+void Launcher::ResetMouseDragState()
+{
+  if (GetActionState() == ACTION_DRAG_ICON)
+    EndIconDrag();
+
+  if (GetActionState() == ACTION_DRAG_LAUNCHER)
+    _hide_machine->SetQuirk(LauncherHideMachine::VERTICAL_SLIDE_ACTIVE, false);
+
+  SetActionState(ACTION_NONE);
+  _dnd_delta_x = 0;
+  _dnd_delta_y = 0;
+  _last_button_press = 0;
+  EnsureAnimation();
+}
+
 void Launcher::RecvMouseDown(int x, int y, unsigned long button_flags, unsigned long key_flags)
 {
   _last_button_press = nux::GetEventButton(button_flags);
@@ -2198,17 +2216,7 @@
   nux::Geometry geo = GetGeometry();
 
   MouseUpLogic(x, y, button_flags, key_flags);
-
-  if (GetActionState() == ACTION_DRAG_ICON)
-    EndIconDrag();
-
-  if (GetActionState() == ACTION_DRAG_LAUNCHER)
-    _hide_machine->SetQuirk(LauncherHideMachine::VERTICAL_SLIDE_ACTIVE, false);
-  SetActionState(ACTION_NONE);
-  _dnd_delta_x = 0;
-  _dnd_delta_y = 0;
-  _last_button_press = 0;
-  EnsureAnimation();
+  ResetMouseDragState();
 }
 
 void Launcher::RecvMouseDrag(int x, int y, int dx, int dy, unsigned long button_flags, unsigned long key_flags)

=== modified file 'plugins/unityshell/src/Launcher.h'
--- plugins/unityshell/src/Launcher.h	2012-03-13 02:07:54 +0000
+++ plugins/unityshell/src/Launcher.h	2012-03-20 23:28:20 +0000
@@ -290,6 +290,8 @@
   void EndIconDrag();
   void UpdateDragWindowPosition(int x, int y);
 
+  void ResetMouseDragState();
+
   float GetAutohidePositionMin() const;
   float GetAutohidePositionMax() const;