Merge lp:~unity-team/unity/unity.fix-1038138 into lp:unity

[Andrea Cimitan]

Fix bug 1038138 by applying some tweaks for tiles with backlight 0.0f

EDIT: TESTED works fine

I can't test this, cause unity trunk doesn't run in both of my notebooks, I used unity-standalone but I need proper testing.

It should fix the bug of the linked bugreport

[Andrea Azzarone (azzar1)]

LGTM.

review: Approve

=== modified file 'unity-shared/IconRenderer.cpp'
--- unity-shared/IconRenderer.cpp	2012-08-21 10:33:07 +0000
+++ unity-shared/IconRenderer.cpp	2012-08-21 15:21:18 +0000
@@ -403,6 +403,7 @@
   nux::Color edge_color(0x55555555);
   nux::Color colorify = arg.colorify;
   nux::Color background_tile_colorify = arg.colorify;
+  bool colorify_background = arg.colorify_background;
   float backlight_intensity = arg.backlight_intensity;
   float glow_intensity = arg.glow_intensity;
   float shadow_intensity = 0.6f;
@@ -415,6 +416,18 @@
 
   bool force_filter = icon_size != background->GetWidth();
 
+  if (backlight_intensity == 0.0f)
+  {
+    // Colorize tiles without backlight with the launcher background color
+    colorify_background = true;
+  }
+
+  if (colorify_background)
+  {
+    // Extra tweaks for tiles that are colorized with the launcher background color
+    background_tile_color = nux::color::White;
+  }
+
   if (arg.keyboard_nav_hl)
   {
     background_tile_color = nux::color::White;
@@ -434,7 +447,7 @@
     colorify.blue +=  (0.5f + 0.5f * arg.saturation) * (1.0f - colorify.blue);
     colorify.green += (0.5f + 0.5f * arg.saturation) * (1.0f - colorify.green);
 
-    if (arg.colorify_background)
+    if (colorify_background)
     {
       background_tile_colorify = background_tile_colorify * 0.7f;
     }
@@ -494,7 +507,7 @@
   edge_color = edge_color + ((background_tile_color - edge_color) * backlight_intensity);
   nux::Color edge_tile_colorify = background_tile_colorify;
 
-  if (arg.colorify_background && !arg.keyboard_nav_hl)
+  if (colorify_background && !arg.keyboard_nav_hl)
   {
     // Mix edge_tile_colorify with plain white (1.0f).
     // Would be nicer to tweak value from HSV colorspace, instead.