Merge lp:~townsend/compiz/fix-deco-under-panel into lp:compiz/0.9.11

[Christopher Townsend]

Fix issue where window decorations would be placed under the Panel when opening a new window from an already open window. This is due to the already open window being taller or just as tall without be maximized than the workspace.

Fix issue where window decorations would be placed under the Panel when opening a new window from an already open window. This is due to the already open window being taller or just as tall without be maximized than the workspace.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3861
http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-ci/73/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-utopic-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-utopic-armhf-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-utopic-i386-ci/1

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

review: Approve (continuous-integration)

[lp:~townsend/compiz/fix-deco-under-panel]

3862. By Christopher Townsend on 2014-05-12

Also account for CenterGravity when adjusting the y axis placement.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3862
http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-ci/74/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-utopic-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-utopic-armhf-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-utopic-i386-ci/2

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

review: Approve (continuous-integration)

[Marco Trevisan (Treviño) (3v1n0)]

Cool, this works well in all the cases I've tested.

review: Approve

=== modified file 'src/window.cpp'
--- src/window.cpp	2014-04-09 15:52:47 +0000
+++ src/window.cpp	2014-05-12 19:26:22 +0000
@@ -6664,6 +6664,9 @@
 
 		if (xwc.x < workarea.x ())
 		    xwc.x = workarea.x () + movement.x ();
+
+		if (xwc.x - boffset.x () < workarea.x ())
+		    xwc.x += boffset.x ();
 	    }
 
 	    if (xwc.y + xwc.height > workarea.y2 ())
@@ -6672,6 +6675,9 @@
 
 		if (xwc.y < workarea.y ())
 		    xwc.y = workarea.y () + movement.y ();
+
+		if (xwc.y - boffset.y () < workarea.y ())
+		    xwc.y += boffset.y ();
 	    }
 
 	    if (priv->actions & CompWindowActionResizeMask)

=== modified file 'src/window/extents/src/windowextents.cpp'
--- src/window/extents/src/windowextents.cpp	2014-03-10 12:53:17 +0000
+++ src/window/extents/src/windowextents.cpp	2014-05-12 19:26:22 +0000
@@ -43,6 +43,7 @@
 	case NorthGravity:
 	case NorthWestGravity:
 	case NorthEastGravity:
+	case CenterGravity:
 	    rv.setY (extents.top);
 	    break;
 	case SouthGravity: