summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Spilsbury <sam.spilsbury@canonical.com>2011-09-29 11:52:13 +0800
committerSam Spilsbury <sam.spilsbury@canonical.com>2011-09-29 11:52:13 +0800
commit8ab501cbf7677ddecdaeb435965832329f4d256c (patch)
tree7d00e073759504bbd00078f68957a8b09990e459
parent734eb439103703a43644a064e4b30ebaf7116b90 (diff)
parent39da87d94e6f9a72a8159e16d6afd10065994a2b (diff)
downloadcore-8ab501cbf7677ddecdaeb435965832329f4d256c.tar.gz
core-8ab501cbf7677ddecdaeb435965832329f4d256c.tar.bz2
Merge lp:~compiz-team/compiz-core/compiz-core.fix_796594
-rw-r--r--plugins/decor/src/decor.cpp2
-rw-r--r--src/window.cpp6
2 files changed, 6 insertions, 2 deletions
diff --git a/plugins/decor/src/decor.cpp b/plugins/decor/src/decor.cpp
index 6a81817..f1d6117 100644
--- a/plugins/decor/src/decor.cpp
+++ b/plugins/decor/src/decor.cpp
@@ -1516,7 +1516,7 @@ DecorWindow::update (bool allowDecoration)
/* Set extents based on maximize/unmaximize state
* FIXME: With the new type system, this should be
* removed */
- if ((window->state () & MAXIMIZE_STATE) == MAXIMIZE_STATE)
+ if ((window->state () & MAXIMIZE_STATE))
window->setWindowFrameExtents (&wd->decor->maxBorder,
&wd->decor->maxInput);
else if (!window->hasUnmapReference ())
diff --git a/src/window.cpp b/src/window.cpp
index 98c0e84..ce0c22c 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -6642,7 +6642,11 @@ CompWindow::setWindowFrameExtents (CompWindowExtents *b,
if (priv->serverInput.left != i->left ||
priv->serverInput.right != i->right ||
priv->serverInput.top != i->top ||
- priv->serverInput.bottom != i->bottom)
+ priv->serverInput.bottom != i->bottom ||
+ priv->border.left != b->left ||
+ priv->border.right != b->right ||
+ priv->border.top != b->top ||
+ priv->border.bottom != b->bottom)
{
unsigned long data[4];