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

[Marco Biscaro]

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

Now there is a check of an override color in RefreshColor (which is called when a PropertyNotify event happens). Also added a check in FullySaturateColor to avoid division by zero.

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

Now there is a check of an override color in 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

[Marco Biscaro (marcobiscaro2112)]

I think it's ok now.

[Marco Biscaro (marcobiscaro2112)]

Is there anyone out there?

[Nick Dedekind (nick-dedekind)]

Looks good.

review: Approve

[Andrea Azzarone (azzar1)]

Add at least a manual test please :)

review: Needs Fixing

[Marco Biscaro (marcobiscaro2112)]

Manual test added.

[Andrea Azzarone (azzar1)]

review: Approve

[Unity Merger (unity-merger)]

No commit message specified.

[MC Return (mc-return)]

A few improvements for the manual test:

+#. On Expiremental tab, change Background Color to #000000, 180 opacity
should be:
+#. Choose Experimental tab, click on Background Color, set Color name to #000000 and Opacity to 180.

+ The background color of Launcher is black, and the icons still visible.
should be:
+ The background color of the Launcher is black, and the icons are still visible.

+ The Launcher must still black when Dash or HUD is opened, and the color must
should be:
+ The Launcher must stay black when Dash or HUD are opened, and the color must

[Marco Biscaro (marcobiscaro2112)]

Manual tests improved and duplicated code removed. Is it ok now?

[MC Return (mc-return)]

Expiremental tab -> Experimental tab

[Marco Biscaro (marcobiscaro2112)]

This MP fixes bug #1010335 too.

[MC Return (mc-return)]

LGTM.

review: Approve

=== modified file 'launcher/Launcher.cpp'
--- launcher/Launcher.cpp	2012-09-01 16:01:02 +0000
+++ launcher/Launcher.cpp	2012-09-03 00:09:22 +0000
@@ -953,7 +953,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 'manual-tests/Launcher.txt'
--- manual-tests/Launcher.txt	2012-08-30 22:24:40 +0000
+++ manual-tests/Launcher.txt	2012-09-03 00:09:22 +0000
@@ -731,3 +731,21 @@
 
 Expected Results:
 * The gedit window must not flicker behind the launcher.
+
+
+Custom background color works
+-----------------------------
+This test ensures that the custom background color (set via ccsm) works correctly.
+
+Setup: 
+#. Ensure that ccsm is installed (package compizconfig-settings-manager)
+
+Actions:  
+#. Open ccsm
+#. Click on Ubuntu Unity Plugin
+#. Choose Experimental tab, click on Background Color, set Color name to #000000 and Opacity to 180
+
+Expected Result:
+ The background color of the Launcher is black, and the icons are still visible.
+ The Launcher must stay black when Dash or HUD are opened, and the color must
+ be persistent between sessions (logout/login).

=== modified file 'unity-shared/BGHash.cpp'
--- unity-shared/BGHash.cpp	2012-08-15 05:29:29 +0000
+++ unity-shared/BGHash.cpp	2012-09-03 00:09:22 +0000
@@ -46,17 +46,17 @@
 {
   override_color_ = color;
 
-  if (override_color_.alpha)
+  RefreshColor();
+}
+
+void BGHash::RefreshColor()
+{
+  if (override_color_.alpha > 0.0f)
   {
     TransitionToNewColor(override_color_);
     return;
   }
 
-  RefreshColor();
-}
-
-void BGHash::RefreshColor()
-{
   Atom         real_type;
   gint         result;
   gint         real_format;