summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSebasian Billaudelle <stein@cream-project.org>2010-05-25 23:23:24 +0800
committerSam Spilsbury <SmSpillaz@gmail.com>2010-05-25 23:23:24 +0800
commit2fb7e4227d516cd2ba8b81e411bbfc0aca127943 (patch)
tree3b09e1b25cf6a3c1f53d61ae760a1aa39dd16919 /src
parentd10b64d92d82e7f1ecdace502cf51a0d9855efe7 (diff)
downloadzcomp-2fb7e4227d516cd2ba8b81e411bbfc0aca127943.tar.gz
zcomp-2fb7e4227d516cd2ba8b81e411bbfc0aca127943.tar.bz2
[PATCH] Handle dock windows with keep-below mask.
Diffstat (limited to 'src')
-rw-r--r--src/window.cpp9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/window.cpp b/src/window.cpp
index c43b3c5..a5cd40f 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -746,12 +746,6 @@ CompWindow::recalcType ()
type = CompWindowTypeDialogMask;
}
- if (type == CompWindowTypeDockMask &&
- (priv->state & CompWindowStateBelowMask))
- {
- type = CompWindowTypeNormalMask;
- }
-
if ((type & (CompWindowTypeNormalMask | CompWindowTypeDialogMask)) &&
(priv->state & CompWindowStateModalMask))
{
@@ -2078,6 +2072,9 @@ PrivateWindow::findSiblingBelow (CompWindow *w,
/* otherwise fall-through */
case CompWindowTypeDockMask:
/* fullscreen and dock layer */
+ if (w->priv->state & CompWindowStateBelowMask)
+ /* keeping dock windows with keep below mask below other windows */
+ break;
if (below->priv->type & (CompWindowTypeFullscreenMask |
CompWindowTypeDockMask))
{