summaryrefslogtreecommitdiff
path: root/src/window.cpp
diff options
context:
space:
mode:
authorSam Spilsbury <smspillaz@gmail.com>2010-08-10 00:01:41 +0800
committerSam Spilsbury <smspillaz@gmail.com>2010-08-10 00:01:41 +0800
commit8f7382fe5a9703e49703c2d7d00799bd5a11732d (patch)
tree21d053cbbc7cc30d5e704a6cd71620964f58392f /src/window.cpp
parent8ba8b19f14768a272a4f5991cfaa5b2069c53687 (diff)
parent4e1a6651ca51e0d81b3526e9d88afaa92b8e405f (diff)
downloadunity-window-decorator-8f7382fe5a9703e49703c2d7d00799bd5a11732d.tar.gz
unity-window-decorator-8f7382fe5a9703e49703c2d7d00799bd5a11732d.tar.bz2
Merge branch 'master' of git+ssh://git.compiz.org/git/compiz/core
Diffstat (limited to 'src/window.cpp')
-rw-r--r--src/window.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/window.cpp b/src/window.cpp
index c18b61a..b986093 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -1371,7 +1371,10 @@ CompWindow::unmap ()
bool
PrivateWindow::restack (Window aboveId)
{
- if (window->prev)
+ if (aboveId && (aboveId == id || aboveId == frame))
+ // Don't try to raise a window above itself
+ return false;
+ else if (window->prev)
{
if (aboveId && (aboveId == window->prev->id () ||
aboveId == window->prev->frame ()))