Merge lp:~sil2100/unity/launcher_dnd_flicker into lp:unity

[Łukasz Zemczak]

When dragging a non-application, do not saturate all icons automatically, but only those that are needed.

Eliminates flickering before 'prelighting' the Launcher icons that can handle the current drag-and-drop (LP #863230).

Problem description:

When drag-and-dropping from the Dash to the Launcher a non-application icon (for instance, a PNG file), the Launcher 'flickers' a bit. This flickering means that the Launcher icons get desaturated for a moment and then loose saturation again (as originally intended), tinted (LP #863230 and more specifically - LP #971086).

The fix:

During drag and drop, instead of saturating all icons automatically when overlay is present, we only do this when we know that we're not dragging a non-application. Otherwise, only saturate the icons that we will actually 'prelight' (i.e. indicate that can handle the given file). This way, there is no flickering and all icons visualize correctly, as intended. There are no longer any tinting problems as well (as noted by JohnLea).

Test coverage:

The following fix can be tested by manual testing of the specified bugs (LP #863230, LP #971086). Problem no longer occurs.

[Alex Launi (alexlauni)]

Please add tests to the suite in manual-tests/

review: Needs Fixing (quality)

[Łukasz Zemczak (sil2100)]

There already seems to be a manual-test that theoretically tests the given behavior:
manual-tests/Dash.txt -> "Launcher drop target saturation test" (from the "Drag and drop tests" section).

Should I modify it more to add details regarding this bug? But it seems rather sufficient.

[Alex Launi (alexlauni)]

Good catch! Thanks. Yeah the current test is sufficient.

review: Approve (quality)

[Unity Merger (unity-merger)]

Attempt to merge into lp:unity failed due to conflicts:

text conflict in plugins/unityshell/src/Launcher.cpp

Unmerged revisions

2253. By Łukasz Zemczak on 2012-04-08

If dragging a non-application, do not saturate all icons automatically. Only those needed.

This way, the 'flickering' animation is not visible during drag-and-drop from Dash.

=== modified file 'plugins/unityshell/src/Launcher.cpp'
--- plugins/unityshell/src/Launcher.cpp	2012-04-06 11:19:18 +0000
+++ plugins/unityshell/src/Launcher.cpp	2012-04-08 22:29:19 +0000
@@ -2668,9 +2668,6 @@
 
   _hide_machine->SetQuirk(LauncherHideMachine::EXTERNAL_DND_ACTIVE, true);
 
-  if (IsOverlayOpen())
-    SaturateIcons();
-
   for (auto it : _dnd_data.Uris())
   {
     if (g_str_has_suffix(it.c_str(), ".desktop"))
@@ -2684,12 +2681,22 @@
   {
     for (auto it : *_model)
     {
-      if (it->QueryAcceptDrop(_dnd_data) != nux::DNDACTION_NONE)
+      if (it->QueryAcceptDrop(_dnd_data) != nux::DNDACTION_NONE) 
+      {
+        it->SetQuirk(AbstractLauncherIcon::QUIRK_DESAT, false);
         it->SetQuirk(AbstractLauncherIcon::QUIRK_DROP_PRELIGHT, true);
-      else
+      }
+      else 
+      {
         it->SetQuirk(AbstractLauncherIcon::QUIRK_DROP_DIM, true);
+      }
     }
   }
+  else
+  {
+    if (IsOverlayOpen())
+      SaturateIcons();
+  }
 }
 
 void