Merge lp:~unity-team/unity/unity.dim-launcher-icons into lp:unity

[Andrea Cimitan]

Set 0.2 as new alpha value for dimmed icons, apply tweaks to edges

Set 0.2 as new alpha value for dimmed icons, apply tweaks to edges

Before: http://i.imgur.com/qYNSZ.png
After: http://i.imgur.com/CmIWu.png

Signed-off by visual design.

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

Looks very good.
Thanks.

review: Approve

[Unity Merger (unity-merger)]

No commit message specified.

=== modified file 'plugins/unityshell/src/IconRenderer.cpp'
--- plugins/unityshell/src/IconRenderer.cpp	2012-03-21 12:31:11 +0000
+++ plugins/unityshell/src/IconRenderer.cpp	2012-03-22 17:04:21 +0000
@@ -510,7 +510,7 @@
                 edge->GetDeviceTexture(),
                 edge_color,
                 edge_tile_colorify,
-                arg.alpha,
+                arg.alpha * arg.alpha, // Dim edges of semi-transparent tiles
                 force_filter,
                 tile_transform);
   // end tile draw

=== modified file 'plugins/unityshell/src/Launcher.cpp'
--- plugins/unityshell/src/Launcher.cpp	2012-03-21 14:44:41 +0000
+++ plugins/unityshell/src/Launcher.cpp	2012-03-22 17:04:21 +0000
@@ -879,7 +879,7 @@
 {
   float desat_value = IconDesatValue(icon, current);
   arg.icon                = icon.GetPointer();
-  arg.alpha               = 0.5f + 0.5f * desat_value;
+  arg.alpha               = 0.2f + 0.8f * desat_value;
   arg.saturation          = desat_value;
   arg.colorify            = nux::color::White;
   arg.running_arrow       = icon->GetQuirk(AbstractLauncherIcon::QUIRK_RUNNING);
@@ -903,9 +903,9 @@
                             icon->GetIconType() == AbstractLauncherIcon::TYPE_EXPO;
 
   // trying to protect against flickering when icon is dragged from dash LP: #863230
-  if (arg.alpha < 0.5)
+  if (arg.alpha < 0.2)
   {
-    arg.alpha = 0.5;
+    arg.alpha = 0.2;
     arg.saturation = 0.0;
   }
 
@@ -997,9 +997,9 @@
     arg.alpha *= drop_dim_value;
 
   // trying to protect against flickering when icon is dragged from dash LP: #863230
-  if (arg.alpha < 0.5)
+  if (arg.alpha < 0.2)
   {
-    arg.alpha = 0.5;
+    arg.alpha = 0.2;
     arg.saturation = 0.0;
   }