Merge lp:~mc-return/compiz/compiz.merge-resizeinfo-minor-improvements into lp:compiz/0.9.9

[MC Return]

Resizeinfo Plugin:

Simplified void InfoLayer::renderBackground () by removing the creation and assignment of the variables int height and width totally.
Using the already defined constants RESIZE_POPUP_HEIGHT and RESIZE_POPUP_WIDTH directly in the following calculations instead of height and width (like done in void InfoScreen::damagePaintRegion () already).

As requested by Daniel, I am separating the fixes for the resizeinfo problems.
This branch just changes the variable types of 'height' and 'width' from int to unsigned short.

[Sam Spilsbury (smspillaz)]

review: Approve

[Daniel van Vugt (vanvugt)]

Rejected unless there's a good reason for this.

Not just because "int" is short and sweet, but "int" is much more efficient for the compiler and CPU to handle than down-casting computation to an unsigned short (which is /usually/ 16-bit).

review: Disapprove

[lp:~mc-return/compiz/compiz.merge-resizeinfo-minor-improvements]

3448. By MC Return on 2012-11-05

Simplified void InfoLayer::renderBackground () by removing the creation and assignment of the variables int height and width totally and instead using the already defined constants RESIZE_POPUP_HEIGHT and RESIZE_POPUP_WIDTH directly in the following calculations (like done in void InfoScreen::damagePaintRegion () already)

[MC Return (mc-return)]

> Rejected unless there's a good reason for this.
>

I have simplified everything a bit now. Hope this is okay...

[MC Return (mc-return)]

review: Needs Resubmitting

[Daniel van Vugt (vanvugt)]

With regular compiler optimizations, changes like this actually make no difference. And even without optimizations, this is not an area of code that benefits from optimization at all.

Actually, it just makes the code a little harder to read and doesn't really provide a benefit. So rejected, sorry.

review: Disapprove

Unmerged revisions

3448. By MC Return on 2012-11-05

Simplified void InfoLayer::renderBackground () by removing the creation and assignment of the variables int height and width totally and instead using the already defined constants RESIZE_POPUP_HEIGHT and RESIZE_POPUP_WIDTH directly in the following calculations (like done in void InfoScreen::damagePaintRegion () already)

3447. By MC Return on 2012-11-01

Changed variable type of the variables 'height' and 'width' from int to unsigned short

=== 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-05 11:58:35 +0000
@@ -178,8 +178,6 @@
 {
     cairo_pattern_t *pattern;	
     float           border = 7.5;
-    int             height = RESIZE_POPUP_HEIGHT;
-    int             width = RESIZE_POPUP_WIDTH;
     float           r, g, b, a;
 
     INFO_SCREEN (screen);
@@ -197,7 +195,7 @@
     cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
 
     /* Setup Gradient */
-    pattern = cairo_pattern_create_linear (0, 0, width, height);
+    pattern = cairo_pattern_create_linear (0, 0, RESIZE_POPUP_WIDTH, RESIZE_POPUP_HEIGHT);
 
     r = is->optionGetGradient1Red () / (float)0xffff;
     g = is->optionGetGradient1Green () / (float)0xffff;
@@ -220,10 +218,10 @@
 	
     /* Rounded Rectangle! */
     cairo_arc (cr, border, border, border, PI, 1.5f * PI);
-    cairo_arc (cr, border + width - 2 * border, border, border,
+    cairo_arc (cr, border + RESIZE_POPUP_WIDTH - 2 * border, border, border,
 	       1.5f * PI, 2.0 * PI);
-    cairo_arc (cr, width - border, height - border, border, 0, PI / 2.0f);
-    cairo_arc (cr, border, height - border, border,  PI / 2.0f, PI);
+    cairo_arc (cr, RESIZE_POPUP_WIDTH - border, RESIZE_POPUP_HEIGHT - border, border, 0, PI / 2.0f);
+    cairo_arc (cr, border, RESIZE_POPUP_HEIGHT - border, border,  PI / 2.0f, PI);
     cairo_close_path (cr);
     cairo_fill_preserve (cr);