Code review comment for lp:~compiz-team/compiz/compiz.fix_1015151

Revision history for this message
Sam Spilsbury (smspillaz) wrote :

Diff, since bzr push :parent bugged out and pushed to lp:compiz (reverted in r3252)

=== modified file 'plugins/wall/src/offset_movement/src/offset-movement.cpp'
--- plugins/wall/src/offset_movement/src/offset-movement.cpp 2012-06-19 23:36:57 +0000
+++ plugins/wall/src/offset_movement/src/offset-movement.cpp 2012-06-19 23:42:45 +0000
@@ -28,7 +28,7 @@
 compiz::wall::movementWindowOnScreen (const CompRect &serverBorderRect,
           const CompRegion &screenRegion)
 {
- CompRegion sbrRegion (serverBorderRect);
+ CompRegion sbrRegion (static_cast <const CompRect &> (serverBorderRect));

     /* If the window would be partially offscreen
      * after it was moved then we should move it back
@@ -41,10 +41,8 @@
     int dx = 0;
     int dy = 0;

- CompRect::vector rects (rem.rects ());
-
- for (std::vector <CompRect>::const_iterator it = rects.begin ();
- it != rects.end ();
+ for (std::vector <CompRect>::const_iterator it = rem.rects ().begin ();
+ it != rem.rects ().end ();
   it++)
     {
  const CompRect &r = *it;

« Back to merge proposal