Merge lp:~mc-return/compiz/compiz.merge-fix1070233-fix1070297-fix1070301-Resizeinfo into lp:compiz/0.9.9

[MC Return]

* Fixed options to change Gradient Color 2 and Gradient Color 3 having no effect and enabled possibility for a gradient background.
* Changed width and height of the popup, so large windows with big numbers will still be displayed elegantly.
* Changed variable types of the variables "height" and "width" from int to unsigned short.
* Show Resize Info for all windows is now enabled by default, as the other option breaks the whole functionality of this plugin.
* Added option to change the color of the background's outline with black as default.
* Proper nouns now all start with uppercase letter.
* Better tooltips and other minor text and wording fixes.

(Fixes: LP #1070233, LP #1070297, Workaround for: LP #1070301)

This video shows Resize Info after the linked branch was merged:
https://bugs.launchpad.net/compiz/+bug/1070233/+attachment/3412780/+files/ResizeInfoAfterFix.webm

Please note:
* The color settings for the gradient background are no longer ignored and correctly applied now.
* CCSM now shows the possibility to change the outline color of the background and it has been changed.

[Daniel van Vugt (vanvugt)]

What part of this fixes bug 1070301? (which I can't reproduce)

review: Needs Information

[MC Return (mc-return)]

> What part of this fixes bug 1070301? (which I can't reproduce)

Line 20 of the preview diff only 'workarounds' it ;)
...by setting the default to true, as the default setting==false does not show the popup at all here.

Hmm, strange you cannot reproduce it as I am running Quantal and Compiz/Unity trunk here.

[MC Return (mc-return)]

review: Resubmit

[MC Return (mc-return)]

Daniel, you are of course right that nothing does really fix bug 1070301 here, it just workarounds it by default, so I have removed the linking to bug 1070301 from this merge request.
I hope it is no problem that I did not rename the branch.

[Daniel van Vugt (vanvugt)]

Please separate the fixes for the two bugs and propose them separately. Please also avoid changing dimensions of existing features like RESIZE_POPUP_WIDTH/HEIGHT.

review: Resubmit

Unmerged revisions

3444. By MC Return on 2012-10-23

Changed width and height of the popup, so large windows will still be displayed elegantly
Changed variable types of the variables height and width from int to unsigned short

3443. By MC Return on 2012-10-23

Black Outline Color is now default

3442. By MC Return on 2012-10-23

Added the possibility to change the color of the outline as well

3441. By MC Return on 2012-10-23

Fixes for resizeinfo.xml.in:
Show Resize Info for all windows is now enabled by default as the other option breaks the whole functionality of this plugin
Proper nouns now start all with uppercase letter
Better tooltips

=== 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-10-23 13:15:24 +0000
@@ -18,19 +18,19 @@
 	<options>
 	    <option name="fade_time" type="int">
 		<_short>Fade Time</_short>
-		<_long>Fade time (in ms) for popup window</_long>
+		<_long>Fade time (in ms) for the popup window.</_long>
 		<default>500</default>
 		<min>10</min>
 		<max>5000</max>
 	    </option>
 	    <option name="always_show" type="bool">
-		<_short>Show resize info for all windows</_short>
-		<_long>Show resize info for all windows as opposed to just windows with a resize increment of greater than 1.</_long>
-		<default>false</default>
+		<_short>Show Resize Info for all windows</_short>
+		<_long>Show resize info for all windows as opposed to just for windows with a resize increment of greater than 1.</_long>
+		<default>true</default>
 	    </option>
 	    <option name="text_color" type="color">
-		<_short>Text color</_short>
-		<_long>Color of text on resize popup.</_long>
+		<_short>Text Color</_short>
+		<_long>Color of the resize popup's text.</_long>
 		<default>
 		    <red>0x0000</red>
 		    <blue>0x0000</blue>
@@ -40,7 +40,7 @@
 	    </option>
 	    <option name="gradient_1" type="color">
 		<_short>Gradient Color 1</_short>
-		<_long>Color 1 of the gradient background.</_long>
+		<_long>Color on the left side of the gradient background.</_long>
 		<default>
 		    <red>0xcccc</red>
 		    <green>0xcccc</green>
@@ -50,7 +50,7 @@
 	    </option>
 	    <option name="gradient_2" type="color">
 		<_short>Gradient Color 2</_short>
-		<_long>Color 2 of the gradient background.</_long>
+		<_long>Color in the middle of the gradient background.</_long>
 		<default>
 		    <red>0xf332</red>
 		    <green>0xf332</green>
@@ -60,7 +60,7 @@
 	    </option>
 	    <option name="gradient_3" type="color">
 		<_short>Gradient Color 3</_short>
-		<_long>Color 3 of the gradient background.</_long>
+		<_long>Color on the right side of the gradient background.</_long>
 		<default>
 		    <red>0xd998</red>
 		    <green>0xd998</green>
@@ -68,6 +68,16 @@
 		    <alpha>0xcccc</alpha>
 		</default>
 	    </option>
+	    <option name="gradient_4" type="color">
+		<_short>Outline Color</_short>
+		<_long>Color of the background's outline.</_long>
+		<default>
+		    <red>0x0000</red>
+		    <green>0x0000</green>
+		    <blue>0x0000</blue>
+		    <alpha>0xcccc</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-10-23 13:15:24 +0000
@@ -25,8 +25,8 @@
 
 COMPIZ_PLUGIN_20090315 (resizeinfo, InfoPluginVTable);
 
-const unsigned short RESIZE_POPUP_WIDTH = 85;
-const unsigned short RESIZE_POPUP_HEIGHT = 50;
+const unsigned short RESIZE_POPUP_WIDTH = 96;
+const unsigned short RESIZE_POPUP_HEIGHT = 32;
 
 const double PI = 3.14159265359f;
 
@@ -178,8 +178,8 @@
 {
     cairo_pattern_t *pattern;	
     float           border = 7.5;
-    int             height = RESIZE_POPUP_HEIGHT;
-    int             width = RESIZE_POPUP_WIDTH;
+    unsigned short  height = RESIZE_POPUP_HEIGHT;
+    unsigned short  width = RESIZE_POPUP_WIDTH;
     float           r, g, b, a;
 
     INFO_SCREEN (screen);
@@ -205,16 +205,16 @@
     a = is->optionGetGradient1Alpha () / (float)0xffff;
     cairo_pattern_add_color_stop_rgba (pattern, 0.00f, r, g, b, a);
 
-    r = is->optionGetGradient1Red () / (float)0xffff;
-    g = is->optionGetGradient1Green () / (float)0xffff;
-    b = is->optionGetGradient1Blue () / (float)0xffff;
-    a = is->optionGetGradient1Alpha () / (float)0xffff;
+    r = is->optionGetGradient2Red () / (float)0xffff;
+    g = is->optionGetGradient2Green () / (float)0xffff;
+    b = is->optionGetGradient2Blue () / (float)0xffff;
+    a = is->optionGetGradient2Alpha () / (float)0xffff;
     cairo_pattern_add_color_stop_rgba (pattern, 0.65f, r, g, b, a);
 
-    r = is->optionGetGradient1Red () / (float)0xffff;
-    g = is->optionGetGradient1Green () / (float)0xffff;
-    b = is->optionGetGradient1Blue () / (float)0xffff;
-    a = is->optionGetGradient1Alpha () / (float)0xffff;
+    r = is->optionGetGradient3Red () / (float)0xffff;
+    g = is->optionGetGradient3Green () / (float)0xffff;
+    b = is->optionGetGradient3Blue () / (float)0xffff;
+    a = is->optionGetGradient3Alpha () / (float)0xffff;
     cairo_pattern_add_color_stop_rgba (pattern, 0.85f, r, g, b, a);
     cairo_set_source (cr, pattern);
 	
@@ -226,11 +226,16 @@
     cairo_arc (cr, border, height - border, border,  PI / 2.0f, PI);
     cairo_close_path (cr);
     cairo_fill_preserve (cr);
-	
+
     /* Outline */
-    cairo_set_source_rgba (cr, 0.9f, 0.9f, 0.9f, 1.0f);
+    r = is->optionGetGradient4Red () / (float)0xffff;
+    g = is->optionGetGradient4Green () / (float)0xffff;
+    b = is->optionGetGradient4Blue () / (float)0xffff;
+    a = is->optionGetGradient4Alpha () / (float)0xffff;
+
+    cairo_set_source_rgba (cr, r, g, b, a);
     cairo_stroke (cr);
-	
+
     cairo_pattern_destroy (pattern);
 }
 
@@ -530,6 +535,7 @@
     optionSetGradient1Notify (gradientChanged);
     optionSetGradient2Notify (gradientChanged);
     optionSetGradient3Notify (gradientChanged);
+    optionSetGradient4Notify (gradientChanged);
 }
 
 InfoWindow::InfoWindow (CompWindow *window) :