Merge lp:~brandontschaefer/unity/drag-icon-launcher-close-dash-fix into lp:unity

[Brandon Schaefer]

Documents and files now dragged from the Dash to the Launcher into an application will close the dash.

=== Problem ===
When dragging files from the Dash to an application in the Launcher the Dash would remain open.

=== Fix ===
If a drag drop is being processed and getting sent to a _dnd_hovered_icon and the Dash is open close the dash.

=== Test ===
Manual test added.

[Thomi Richards (thomir-deactivatedaccount)]

Approved, although we need more information about how we can test the file lens. Ideally we'd be able to make sure the file lens is showing a particular file, at which point we can write an autopilot test for this.

review: Approve

=== modified file 'launcher/Launcher.cpp'
--- launcher/Launcher.cpp	2012-06-15 02:03:31 +0000
+++ launcher/Launcher.cpp	2012-06-20 19:14:18 +0000
@@ -2139,14 +2139,14 @@
           {
             if (!(*it)->GetQuirk(AbstractLauncherIcon::QUIRK_VISIBLE) || !(*it)->IsVisibleOnMonitor(monitor))
               continue;
-            
+
             if ((*it) == hovered_icon) {
               if (prevIt != _model->end()) {
                 iconBeforeHover = *prevIt;
               }
               break;
             }
-            
+
             prevIt = it;
           }
 
@@ -2813,6 +2813,9 @@
   }
   else if (_dnd_hovered_icon && _drag_action != nux::DNDACTION_NONE)
   {
+     if (IsOverlayOpen())
+       ubus_.SendMessage(UBUS_PLACE_VIEW_CLOSE_REQUEST);
+
     _dnd_hovered_icon->AcceptDrop(_dnd_data);
   }
 
 
=== modified file 'manual-tests/Dash.txt'
--- manual-tests/Dash.txt	2012-04-02 14:01:37 +0000
+++ manual-tests/Dash.txt	2012-06-20 19:14:18 +0000
@@ -105,7 +105,7 @@
 
 Outcome:
   "All" should be selected by default in every filter category.
-  
+
 Test "All" Button 2
 Note: Should be automated
 -------------------
@@ -119,7 +119,7 @@
 
 Outcome:
   Click on it should do nothing.
-  
+
 
 Test "All" Button 3
 Note: Should be automated
@@ -190,6 +190,20 @@
   this saturation-process should be smooth and without flicker.
   The tinting of the non-drag-targets should not change.
 
+
+Dash to Launcher document-file drag
+-----------------------------------
+
+Setup:
+#. Open the Dash (Super).
+#. Go to the Music Lens.
+
+Action:
+#. Drag any music file into the Firefox icon on the launcher.
+
+Outcome:
+  The Dash should close and the music file should open up in Firefox.
+
 Lens Tests
 ============
 
@@ -217,7 +231,7 @@
 Note: Should be automated
 ----------------------------------------------------
 
-Setup: 
+Setup:
 #. Restart your computer to get a clean unity instance
 
 Action:
@@ -242,4 +256,4 @@
 
 Wrong Outcome:
   #2 and #4 both produce non-empty result which means the lenses were not
-  lazy-loaded but they were running before the first dash use.
 \ No newline at end of file
+  lazy-loaded but they were running before the first dash use.