Merge lp:~azzar1/unity/fix-839717-5.0 into lp:unity/5.0

[Andrea Azzarone]

Backport branch lp:~andyrock/unity/fix-839717

== Problem ==
Launcher - when a user starts dragging a item, any folded launcher icons that are valid drop receptacles should unfold.

== Fix ==
Use QUIRK_PRESENT to unfold a valid target icon.

== Test ==
Manual test added.

http://ubuntuone.com/0B37q9nf0vcjxVMojeSMvN

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

+1

review: Approve

=== modified file 'manual-tests/Launcher.txt'
--- manual-tests/Launcher.txt	2012-06-22 17:21:20 +0000
+++ manual-tests/Launcher.txt	2012-07-13 10:11:32 +0000
@@ -556,3 +556,20 @@
 Expected Results:
  * The device launcher icon has been removed.
 
+
+Test launcher unfolds valid drop icons during dnd
+------------------------------------------------------------
+This test makes sure that Unity launcher unfolds valid drop icons during
+drag and drop.
+
+Setup:
+ * Add icons to the laucnher so that some of them in the bottom are folded.
+ * Add Nautilus icon too, making sure it is folded.
+
+Actions:
+ * Show Desktop
+ * Drag a folder icon
+
+Expected Results:
+ * All the valid drop icons should unfold during the drag and drop.
+

=== modified file 'plugins/unityshell/src/Launcher.cpp'
--- plugins/unityshell/src/Launcher.cpp	2012-06-21 16:10:54 +0000
+++ plugins/unityshell/src/Launcher.cpp	2012-07-13 10:11:32 +0000
@@ -2741,6 +2741,7 @@
       {
         it->SetQuirk(AbstractLauncherIcon::QUIRK_DESAT, false);
         it->SetQuirk(AbstractLauncherIcon::QUIRK_DROP_PRELIGHT, true);
+        it->SetQuirk(AbstractLauncherIcon::QUIRK_PRESENTED, true);
       }
       else
       {
@@ -2777,6 +2778,7 @@
   {
     it->SetQuirk(AbstractLauncherIcon::QUIRK_DROP_PRELIGHT, false);
     it->SetQuirk(AbstractLauncherIcon::QUIRK_DROP_DIM, false);
+    it->SetQuirk(AbstractLauncherIcon::QUIRK_PRESENTED, false);
   }
 
   DndHoveredIconReset();