Merge lp:~mc-return/compiz/compiz.merge-fix1070297-no-possibility-to-change-background-outline-color into lp:compiz/0.9.9

[MC Return]

Resizeinfo Plug-In:
Added option to change the color of the background's outline.
(LP: #1070297)

Also renamed 'gradientChanged' to 'backgroundColorChanged'.

As requested by Daniel, I am separating the fixes for the resizeinfo problems.
This branch just adds the option to change resizeinfo plug-in's background outline color via CCSM as well, so all the colors can be adjusted.

[Sam Spilsbury (smspillaz)]

33 + a = is->optionGetGradient4Alpha () / (float)0xffff;

Instead of using 0xffff here it might be better to use std::numeric_limits and static_cast

eg

a = is->optionGetGradient4Alpha () / static_cast <float> (std::numeric_limits <int>::max ())

Also I think an option name like gradient_4 sounds a bit weird especially as there's no correlation between "Outline Color" in the settings manager and Gradient4 in the code. Just use outline_color.

[MC Return (mc-return)]

> 33 + a = is->optionGetGradient4Alpha () / (float)0xffff;
>
> Instead of using 0xffff here it might be better to use std::numeric_limits and
> static_cast
>
> eg
>
> a = is->optionGetGradient4Alpha () / static_cast <float> (std::numeric_limits
> <int>::max ())

Done in r3449.

> Also I think an option name like gradient_4 sounds a bit weird especially as
> there's no correlation between "Outline Color" in the settings manager and
> Gradient4 in the code. Just use outline_color.

Done in r3448. Also renamed 'static void gradientChanged' to 'static void backgroundColorChanged' in this commit.

[Sam Spilsbury (smspillaz)]

Cool, looking good.

One more thing I realized was that you can probably have a constant for the int maximum as a float to avoid the compound statement (I forget about this all the time, so)

const float intMaxAsFloat = std::numeric_limits <int>::max ();

Feel free to do that. Its not important. I'll leave this approved till Daniel looks at it.

review: Approve

[MC Return (mc-return)]

> Cool, looking good.
>
> One more thing I realized was that you can probably have a constant for the
> int maximum as a float to avoid the compound statement (I forget about this
> all the time, so)
>
> const float intMaxAsFloat = std::numeric_limits <int>::max ();
>
> Feel free to do that. Its not important. I'll leave this approved till Daniel
> looks at it.

Thanks a lot for the review and your approval :).
I would like to do this change also, but would prefer to do it once the resize info branches are merged, because the same change would need to be done to the other branch as well.
But it is noted and I will do it in a separate branch together with the gradient_1-3 name changes.

[Daniel van Vugt (vanvugt)]

Again, this is mathematically incorrect:
    static_cast <float> (std::numeric_limits <int>::max ())
so I'm not sure how/if it's working for you.

It should be 65535.0f instead. Or even (float)COLOR or (float)OPAQUE [from composite.h]

review: Needs Fixing

[MC Return (mc-return)]

> Again, this is mathematically incorrect:
> static_cast <float> (std::numeric_limits <int>::max ())
> so I'm not sure how/if it's working for you.
>

It was working, when I tested it...

> It should be 65535.0f instead. Or even (float)COLOR or (float)OPAQUE [from
> composite.h]

Going back to (float)0xffff as it is done almost everywhere in lp:compiz.
If we want a change here, we probably could and should do it in a special commit and throughout the whole lp:compiz codebase.

review: Resubmit

[Daniel van Vugt (vanvugt)]

Please change the default outline colour in the XML back to the old default. Should be something like:
   0xe665 0xe665 0xe665 0xffff

There shouldn't be any visual changes to default colours.

review: Needs Fixing

[MC Return (mc-return)]

> Please change the default outline colour in the XML back to the old default.
> Should be something like:
> 0xe665 0xe665 0xe665 0xffff
>

Done in r 3452. :)

review: Resubmit

[Daniel van Vugt (vanvugt)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/compiz-mbs-autolanding/58/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=amd64/58/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=i386/58/console

review: Needs Fixing (continuous-integration)

[Martin Mrazik (mrazik)]

Same jenkins issue as in the previous job. Should be fixed now.

=== modified file 'plugins/resizeinfo/resizeinfo.xml.in'
--- plugins/resizeinfo/resizeinfo.xml.in	2012-10-15 10:31:51 +0000
+++ plugins/resizeinfo/resizeinfo.xml.in	2012-11-06 08:27:25 +0000
@@ -68,6 +68,16 @@
 		    <alpha>0xcccc</alpha>
 		</default>
 	    </option>
+	    <option name="outline_color" type="color">
+		<_short>Outline Color</_short>
+		<_long>Color of the background's outline.</_long>
+		<default>
+		    <red>0xe665</red>
+		    <green>0xe665</green>
+		    <blue>0xe665</blue>
+		    <alpha>0xffff</alpha>
+		</default>
+	    </option>
 	</options>
     </plugin>
 </compiz>

=== modified file 'plugins/resizeinfo/src/resizeinfo.cpp'
--- plugins/resizeinfo/src/resizeinfo.cpp	2012-09-07 23:29:42 +0000
+++ plugins/resizeinfo/src/resizeinfo.cpp	2012-11-06 08:27:25 +0000
@@ -228,14 +228,18 @@
     cairo_fill_preserve (cr);
 	
     /* Outline */
-    cairo_set_source_rgba (cr, 0.9f, 0.9f, 0.9f, 1.0f);
+    r = is->optionGetOutlineColorRed () / (float)0xffff;
+    g = is->optionGetOutlineColorGreen () / (float)0xffff;
+    b = is->optionGetOutlineColorBlue () / (float)0xffff;
+    a = is->optionGetOutlineColorAlpha () / (float)0xffff;
+    cairo_set_source_rgba (cr, r, g, b, a);
     cairo_stroke (cr);
 	
     cairo_pattern_destroy (pattern);
 }
 
 static void
-gradientChanged (CompOption                 *o, 
+backgroundColorChanged (CompOption                 *o, 
 		 ResizeinfoOptions::Options num)
 {
     INFO_SCREEN (screen);
@@ -527,9 +531,10 @@
 
     backgroundLayer.renderBackground ();
 
-    optionSetGradient1Notify (gradientChanged);
-    optionSetGradient2Notify (gradientChanged);
-    optionSetGradient3Notify (gradientChanged);
+    optionSetGradient1Notify (backgroundColorChanged);
+    optionSetGradient2Notify (backgroundColorChanged);
+    optionSetGradient3Notify (backgroundColorChanged);
+    optionSetOutlineColorNotify (backgroundColorChanged);
 }
 
 InfoWindow::InfoWindow (CompWindow *window) :