Merge lp:~vanvugt/compiz/fix-974242-976032 into lp:compiz/0.9.8

[Daniel van Vugt]

Fix multiple window placement bugs (LP: #974242) (LP: #976032)
By: Rock <email address hidden>

Fix multiple window placement bugs (LP: #974242) (LP: #976032)
By: Rock <email address hidden>

Note: I have not tested this myself yet. But it seems a few people have given the patch the thumbs up. -Daniel

[Sam Spilsbury (smspillaz)]

review: Approve

[Daniel van Vugt (vanvugt)]

I'd like to test this myself before we approve it fully.

[Sam Spilsbury (smspillaz)]

Oh actually, no:

14 + if (!mStrutWindows.empty ())
15 + {
...
19 + if (mStrutWindows.empty ())
20 + doHandleScreenSizeChange (screen->width (),
21 + screen->height ()); /* 2nd pass */
22 + }

dohandleScreenSizeChange will never be called. This needs a better solution.

review: Needs Fixing

[Francis Ginther (fginther)]

Review was claimed by accident, please ignore.

review: Abstain

[Daniel van Vugt (vanvugt)]

I made the same mistake in reading as Sam did above. But it's just a mistake it seems. The empty checks are correct because of the
  mStrutWindows.remove (w);

So looks good.

review: Approve

=== modified file 'plugins/place/src/place.cpp'
--- plugins/place/src/place.cpp	2012-06-24 09:00:27 +0000
+++ plugins/place/src/place.cpp	2012-07-27 02:51:20 +0000
@@ -228,12 +228,15 @@
 	        w = screen->findWindow (event->xproperty.window);
 	        if (w)
 	        {
-		    mStrutWindows.remove (w);
-		    /* Only do when handling screen size change.
-		       ps->strutWindowCount is 0 at any other time */
-		    if (mStrutWindows.empty ())
-			doHandleScreenSizeChange (screen->width (),
-						  screen->height ()); /* 2nd pass */
+		    if (!mStrutWindows.empty ())
+		    {
+			mStrutWindows.remove (w);
+			/* Only do when handling screen size change.
+			   ps->strutWindowCount is 0 at any other time */
+			if (mStrutWindows.empty ())
+			    doHandleScreenSizeChange (screen->width (),
+						      screen->height ()); /* 2nd pass */
+		    }
 	        }
 	    }
     }