Merge lp:~brandontschaefer/unity/drag-file-dash-to-launcher-close-SRU into lp:unity/5.0

[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.

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

LGTM

review: Approve

[Unity Merger (unity-merger)]

No commit message specified.

=== modified file 'manual-tests/Dash.txt'
--- manual-tests/Dash.txt	2012-04-02 14:01:37 +0000
+++ manual-tests/Dash.txt	2012-06-21 17:34:49 +0000
@@ -190,6 +190,19 @@
   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
 ============
 
@@ -242,4 +255,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.

=== modified file 'plugins/unityshell/src/Launcher.cpp'
--- plugins/unityshell/src/Launcher.cpp	2012-06-18 16:25:00 +0000
+++ plugins/unityshell/src/Launcher.cpp	2012-06-21 17:34:49 +0000
@@ -2286,14 +2286,14 @@
           {
             if (!(*it)->GetQuirk(AbstractLauncherIcon::QUIRK_VISIBLE) || !(*it)->IsVisibleOnMonitor(monitor))
               continue;
-            
+
             if ((*it) == hovered_icon) {
               if (prevIt != _model->end()) {
                 iconBeforeHover = *prevIt;
               }
               break;
             }
-            
+
             prevIt = it;
           }
 
@@ -2975,6 +2975,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);
   }