Merge lp:~smspillaz/compiz-core/fix_894685 into lp:compiz-core/0.9.5

Proposed by Sam Spilsbury
Status: Superseded
Proposed branch: lp:~smspillaz/compiz-core/fix_894685
Merge into: lp:compiz-core/0.9.5
Prerequisite: lp:~smspillaz/compiz-core/fix_894633_geometry_saver_class
Diff against target: 32 lines (+8/-6)
1 file modified
plugins/opengl/src/paint.cpp (+8/-6)
To merge this branch: bzr merge lp:~smspillaz/compiz-core/fix_894685
Reviewer Review Type Date Requested Status
Alan Griffiths Approve
Review via email: mp+84057@code.launchpad.net

This proposal has been superseded by a proposal from 2012-01-13.

Description of the change

Correctly translate regions to fix "black areas" of the screen due to paint occlusion detection.

Next: lp:~smspillaz/compiz-core/fix_894688

To post a comment you must log in.
Revision history for this message
Sam Spilsbury (smspillaz) wrote :

Correctly translate regions to fix "black areas" of the screen due to paint occlusion detection.

lp:~smspillaz/compiz-core/fix_894685 updated
2901. By Sam Spilsbury

Merged compiz-core.fix_894633_geometry_saver_class into compiz-core.fix_894685.

2902. By Sam Spilsbury

Merged compiz-core.fix_894633_geometry_saver_class into compiz-core.fix_894685.

2903. By Sam Spilsbury

Merged compiz-core.fix_894633_geometry_saver_class into compiz-core.fix_894685.

2904. By Sam Spilsbury

Merged compiz-core.fix_894633_geometry_saver_class into compiz-core.fix_894685.

2905. By Sam Spilsbury

Merged compiz-core.fix_894633_geometry_saver_class into compiz-core.fix_894685.

2906. By Sam Spilsbury

Merged compiz-core.fix_894633_geometry_saver_class into compiz-core.fix_894685.

2907. By Sam Spilsbury

Merged compiz-core.fix_894633_geometry_saver_class into compiz-core.fix_894685.

2908. By Sam Spilsbury

Merged compiz-core.fix_894633_geometry_saver_class into compiz-core.fix_894685.

2909. By Sam Spilsbury

Merged compiz-core.fix_894633_geometry_saver_class into compiz-core.fix_894685.

2910. By Sam Spilsbury

Merged compiz-core.fix_894633_geometry_saver_class into compiz-core.fix_894685.

2911. By Sam Spilsbury

Fix merge error

2912. By Sam Spilsbury

Merged compiz-core.fix_894633_geometry_saver_class into compiz-core.fix_894685.

2913. By Sam Spilsbury

Merged compiz-core.fix_894633_geometry_saver_class into compiz-core.fix_894685.

2914. By Sam Spilsbury

Merged compiz-core.fix_894633_geometry_saver_class into compiz-core.fix_894685.

2915. By Sam Spilsbury

Merged compiz-core.fix_894633_geometry_saver_class into compiz-core.fix_894685.

2916. By Sam Spilsbury

Merged compiz-core.fix_894633_geometry_saver_class into compiz-core.fix_894685.

2917. By Sam Spilsbury

Merged compiz-core.fix_894633_geometry_saver_class into compiz-core.fix_894685.

2918. By Sam Spilsbury

Merged compiz-core.fix_894633_geometry_saver_class into compiz-core.fix_894685.

2919. By Sam Spilsbury

Merged compiz-core.fix_894633_geometry_saver_class into compiz-core.fix_894685.

2920. By Sam Spilsbury

Merged compiz-core.fix_894633_geometry_saver_class into compiz-core.fix_894685.

2921. By Sam Spilsbury

Merged compiz-core.fix_894633_geometry_saver_class into compiz-core.fix_894685.

2922. By Sam Spilsbury

Merged compiz-core.fix_894633_geometry_saver_class into compiz-core.fix_894685.

Revision history for this message
Alan Griffiths (alan-griffiths) :
review: Approve
lp:~smspillaz/compiz-core/fix_894685 updated
2923. By Sam Spilsbury

Merged compiz-core.fix_894633_geometry_saver_class into compiz-core.fix_894685.

2924. By Sam Spilsbury

Merged compiz-core.fix_894633_geometry_saver_class into compiz-core.fix_894685.

2925. By Sam Spilsbury

Merged compiz-core.fix_894633_geometry_saver_class into compiz-core.fix_894685.

2926. By Sam Spilsbury

Merged compiz-core.fix_894633_geometry_saver_class into compiz-core.fix_894685.

Unmerged revisions

2926. By Sam Spilsbury

Merged compiz-core.fix_894633_geometry_saver_class into compiz-core.fix_894685.

2925. By Sam Spilsbury

Merged compiz-core.fix_894633_geometry_saver_class into compiz-core.fix_894685.

2924. By Sam Spilsbury

Merged compiz-core.fix_894633_geometry_saver_class into compiz-core.fix_894685.

2923. By Sam Spilsbury

Merged compiz-core.fix_894633_geometry_saver_class into compiz-core.fix_894685.

2922. By Sam Spilsbury

Merged compiz-core.fix_894633_geometry_saver_class into compiz-core.fix_894685.

2921. By Sam Spilsbury

Merged compiz-core.fix_894633_geometry_saver_class into compiz-core.fix_894685.

2920. By Sam Spilsbury

Merged compiz-core.fix_894633_geometry_saver_class into compiz-core.fix_894685.

2919. By Sam Spilsbury

Merged compiz-core.fix_894633_geometry_saver_class into compiz-core.fix_894685.

2918. By Sam Spilsbury

Merged compiz-core.fix_894633_geometry_saver_class into compiz-core.fix_894685.

2917. By Sam Spilsbury

Merged compiz-core.fix_894633_geometry_saver_class into compiz-core.fix_894685.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'plugins/opengl/src/paint.cpp'
--- plugins/opengl/src/paint.cpp 2012-01-11 08:48:24 +0000
+++ plugins/opengl/src/paint.cpp 2012-01-11 08:48:25 +0000
@@ -287,12 +287,14 @@
287287
288 if (status)288 if (status)
289 {289 {
290 CompRegion pr = w->region ();
291
290 if (withOffset)292 if (withOffset)
291 {293 pr.translate (offXY);
292 tmpRegion -= w->region ().translated (offXY);294
293 }295 pr.translate (gw->priv->cWindow->paintOffset ());
294 else296
295 tmpRegion -= w->region ();297 tmpRegion -= pr;
296298
297 /* unredirect top most fullscreen windows. */299 /* unredirect top most fullscreen windows. */
298 if (count == 0 && unredirectFS)300 if (count == 0 && unredirectFS)
@@ -340,7 +342,7 @@
340342
341 const CompRegion &clip =343 const CompRegion &clip =
342 (!(mask & PAINT_SCREEN_NO_OCCLUSION_DETECTION_MASK)) ?344 (!(mask & PAINT_SCREEN_NO_OCCLUSION_DETECTION_MASK)) ?
343 gw->clip () : region;345 gw->clip () : region.translated (gw->priv->cWindow->paintOffset ());
344346
345 CompPoint offset =347 CompPoint offset =
346 cScreen->windowPaintOffset ();348 cScreen->windowPaintOffset ();

Subscribers

People subscribed via source and target branches