Merge lp:~3v1n0/compiz/extents-resize-fixes into lp:compiz/0.9.11

[Marco Trevisan (Treviño)]

Window: define proper cases when we need to resize a window when decorating/undecorating

Yeah, again here... So, now when setting the window extents, we resize a window only in these cases:
1) We have a normal window that has never been decorated (lp:1282304)
2) We're (re)decorating a maximized or fullscreen window (lp:1282305)

This seems to work well in all the cases I tested, with no regressions with nedit
(that highlighted an issue with old code path)

So, it seems we need to avoid resizing a window when decorating/undecorating it in some cases, while it's needed when creating a new normal window, or it might be go under the bottom edge of the screen.

[Brandon Schaefer (brandontschaefer)]

LGTM :)

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3831
http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-ci/36/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-trusty-amd64-ci/36
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-trusty-armhf-ci/36
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-trusty-i386-ci/36

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/compiz-0.9.11-ci/36/rebuild

review: Approve (continuous-integration)

=== modified file 'src/privatewindow.h'
--- src/privatewindow.h	2014-01-13 15:52:59 +0000
+++ src/privatewindow.h	2014-02-20 01:14:41 +0000
@@ -401,6 +401,7 @@
 	bool shaded;
 	bool hidden;
 	bool grabbed;
+	bool alreadyDecorated;
 
 	unsigned int desktop;
 
 
=== modified file 'src/window.cpp'
--- src/window.cpp	2014-01-17 12:20:34 +0000
+++ src/window.cpp	2014-02-20 01:14:41 +0000
@@ -6341,6 +6341,7 @@
     shaded (false),
     hidden (false),
     grabbed (false),
+    alreadyDecorated (false),
 
     desktop (0),
 
@@ -6588,14 +6589,20 @@
 	CompSize sizeDelta;
 
 	/* We don't want to change the size of the window in general, but this is
-	 * needed in case that the window is maximized, so that it will extend
+	 * needed in case that a normal windows has just been decorated or if
+	 * the window was maximized or fullscreen, so that it will extend
 	 * to use the whole available space. */
-	if ((state() & MAXIMIZE_STATE) == MAXIMIZE_STATE)
+
+	if (((priv->type & CompWindowTypeNormalMask) && !priv->alreadyDecorated) ||
+	    (priv->state & MAXIMIZE_STATE) == MAXIMIZE_STATE ||
+	    (priv->state & CompWindowStateFullscreenMask) ||
+	    (priv->type & CompWindowTypeFullscreenMask))
 	{
 	    sizeDelta.setWidth (-((b->left + b->right) -
 				  (priv->border.left + priv->border.right)));
 	    sizeDelta.setHeight (-((b->top + b->bottom) -
 				   (priv->border.top + priv->border.bottom)));
+	    priv->alreadyDecorated = true;
 	}
 
 	priv->serverInput = *i;