summaryrefslogtreecommitdiff
path: root/src/window.cpp
diff options
context:
space:
mode:
authorSam Spilsbury <smspillaz@gmail.com>2010-06-19 02:09:09 +0800
committerSam Spilsbury <smspillaz@gmail.com>2010-06-19 02:09:40 +0800
commitf3d4bbbdbf5405b37fbd0f6b7ce7e8a37f889f38 (patch)
treeb80d85a169fa1d42e4993aeef13500cd04598d00 /src/window.cpp
parent89e1a88c09957a602ed083db21f9b500f6724ca5 (diff)
downloadunity-window-decorator-f3d4bbbdbf5405b37fbd0f6b7ce7e8a37f889f38.tar.gz
unity-window-decorator-f3d4bbbdbf5405b37fbd0f6b7ce7e8a37f889f38.tar.bz2
Revert "[PATCH] Handle dock windows with keep-below mask."
This reverts commit 2fb7e4227d516cd2ba8b81e411bbfc0aca127943. Handling dock windows like this causes problems for docks that are set above windows (like plasma panel) we need to find a better way to handle these windows
Diffstat (limited to 'src/window.cpp')
-rw-r--r--src/window.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/window.cpp b/src/window.cpp
index a5cd40f..c43b3c5 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -746,6 +746,12 @@ CompWindow::recalcType ()
type = CompWindowTypeDialogMask;
}
+ if (type == CompWindowTypeDockMask &&
+ (priv->state & CompWindowStateBelowMask))
+ {
+ type = CompWindowTypeNormalMask;
+ }
+
if ((type & (CompWindowTypeNormalMask | CompWindowTypeDialogMask)) &&
(priv->state & CompWindowStateModalMask))
{
@@ -2072,9 +2078,6 @@ 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))
{