summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Spilsbury <sam.spilsbury@canonical.com>2010-12-07 23:46:26 +0800
committerSam Spilsbury <sam.spilsbury@canonical.com>2010-12-07 23:46:26 +0800
commit7dd42ee0f33e186726a9bd7262c1e1ac2951756e (patch)
tree5c3c1d54ef031e946b664bd1eed19a2a9f4f7fa2
parent2dde3a7942733ded7db30cf695b54737943275a8 (diff)
downloadcompiz-with-glib-mainloop-7dd42ee0f33e186726a9bd7262c1e1ac2951756e.tar.gz
compiz-with-glib-mainloop-7dd42ee0f33e186726a9bd7262c1e1ac2951756e.tar.bz2
Only reflect the decoration size in MapRequest gravity adjustment, not
the whole window size. Forward port a86c461684f122fd286884c4ff28f6ea673fe669
-rw-r--r--src/window.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/window.cpp b/src/window.cpp
index 99bbd8b..3568878 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -1354,8 +1354,8 @@ CompWindow::unmap ()
/* revert gravity adjustment made at MapNotify time */
xwc.x = priv->serverGeometry.x ();
xwc.y = priv->serverGeometry.y ();
- xwc.width = priv->serverGeometry.width ();
- xwc.height = priv->serverGeometry.height ();
+ xwc.width = 0;
+ xwc.height = 0;
xwcm = priv->adjustConfigureRequestForGravity (&xwc,
CWX | CWY,
@@ -4627,11 +4627,11 @@ PrivateWindow::processMap ()
XWindowChanges xwc;
unsigned int xwcm;
- /* adjust for gravity */
+ /* adjust for gravity, but only for frame size */
xwc.x = priv->serverGeometry.x ();
xwc.y = priv->serverGeometry.y ();
- xwc.width = priv->serverGeometry.width ();
- xwc.height = priv->serverGeometry.height ();
+ xwc.width = 0;
+ xwc.height = 0;
xwcm = adjustConfigureRequestForGravity (&xwc, CWX | CWY, gravity, 1);