Merge lp:~marcobiscaro2112/unity/custom-bg into lp:unity

[Marco Biscaro]

Fixing bug #924586 and bug #975350, both about custom background color.

I moved the check of an override color from OnBackgroundChanged to RefreshColor (which is called when a PropertyNotify event happens). Also added a check in FullySaturateColor to avoid division by zero.

[Thomi Richards (thomir-deactivatedaccount)]

review: Approve

[Doug McMahon (mc3man)]

If this needs another reviewer to check & possibly approve then how about someone do so. Myself have seen no ill effects when applied to either the 5.12 -0ubuntu1.1 & 5.12 -0ubuntu2 sources & it fixes both targeted bugs

[Daniel van Vugt (vanvugt)]

I wonder if this fixes bug 1010335 too?...

[Daniel van Vugt (vanvugt)]

I've now tested this proposal and bug 1010335 is not fixed by it.

[Daniel van Vugt (vanvugt)]

Manual testing reveals:
Bug 924586 is fixed.
Bug 975350 is not fixed (all custom colouring is still lost when the dash opens).

review: Needs Fixing

[Doug McMahon (mc3man)]

Well obviously the above diff worked just fine in 5.12/12.04 to fix both bugs. Also, at least here with a minor change to the BGHash.cpp section using todays unity trunk thru r 2404, a custom color is maintained thru opening Dash, log outs/in's, ect. (#000000 is still good also
hopefully whatever you all do is provided to both 12.04 with whatever unity is going to be used & 12.10

[Gord Allott (gordallott)]

9 + if (max != 0)

lets change that to
if (max > 0.0)

comparing floats to ints is full of danger.

[Omer Akram (om26er)]

review: Needs Fixing

=== modified file 'launcher/Launcher.cpp'
--- launcher/Launcher.cpp	2012-07-11 05:46:00 +0000
+++ launcher/Launcher.cpp	2012-07-12 14:06:21 +0000
@@ -964,7 +964,10 @@
 nux::Color FullySaturateColor (nux::Color color)
 {
   float max = std::max<float>(color.red, std::max<float>(color.green, color.blue));
-  color = color * (1.0f / max);
+  if (max > 0.0f)
+  {
+    color = color * (1.0f / max);
+  }
   return color;
 }
 
 
=== modified file 'unity-shared/BGHash.cpp'
--- unity-shared/BGHash.cpp	2012-06-18 02:57:23 +0000
+++ unity-shared/BGHash.cpp	2012-07-12 14:06:21 +0000
@@ -59,6 +59,12 @@
 
 void BGHash::RefreshColor()
 {
+  if (override_color_.alpha)
+  {
+    TransitionToNewColor (override_color_);
+    return;
+  }
+
   Atom         real_type;
   gint         result;
   gint         real_format;