Merge lp:~vanvugt/compiz/fix-1068518 into lp:compiz/0.9.9

[Daniel van Vugt]

Stop the resize border (Rectangle resize mode) from flickering slightly.
This was due to the damage/redraw rectangle being too small to include it,
so the border was overdrawing itself without the pixels behind it being
redrawn first.
(LP: #1068518)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3438
http://jenkins.qa.ubuntu.com/job/compiz-ci/203/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/203/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

The Jenkins failure is bug 1071238. A fix is coming.

[Sam Spilsbury (smspillaz)]

The build will soon be green, resubmit to get a green CI review.

review: Needs Resubmitting

[MC Return (mc-return)]

LGTM.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3438
http://jenkins.qa.ubuntu.com/job/compiz-ci/225/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/225/console

review: Needs Fixing (continuous-integration)

[Sam Spilsbury (smspillaz)]

... try again and / or merge trunk

[lp:~vanvugt/compiz/fix-1068518]

3439. By Daniel van Vugt on 2012-10-29

Merge latest lp:compiz

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3439
http://jenkins.qa.ubuntu.com/job/compiz-ci/228/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/228/console

review: Approve (continuous-integration)

=== modified file 'plugins/resize/src/resize.cpp'
--- plugins/resize/src/resize.cpp	2012-08-22 06:08:44 +0000
+++ plugins/resize/src/resize.cpp	2012-10-29 10:24:21 +0000
@@ -178,7 +178,8 @@
     }
 
     /* draw outline */
-    glLineWidth (2.0);
+    static const int borderWidth = 2;
+    glLineWidth (borderWidth);
     streamingBuffer->begin (GL_LINES);
     streamingBuffer->addColors (1, borderColor);
     streamingBuffer->addVertices (8, &vertexData2[0]);
@@ -194,7 +195,10 @@
 #endif
 
     CompositeScreen *cScreen = CompositeScreen::get (screen);
-    CompRect damage (box.x1, box.y1, box.x2 - box.x1, box.y2 - box.y1);
+    CompRect damage (box.x1 - borderWidth,
+                     box.y1 - borderWidth,
+                     box.x2 - box.x1 + 2 * borderWidth,
+                     box.y2 - box.y1 + 2 * borderWidth);
     cScreen->damageRegion (damage);
 }