summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDanny Baumann <dannybaumann@web.de>2008-10-24 09:31:07 +0200
committerDanny Baumann <dannybaumann@web.de>2008-10-24 09:31:07 +0200
commit94b2e375d3b8692dc46468ba95489f6ee1ebbbf2 (patch)
treeb22a6320ced6b73ded476fd83f2ed9e4b839f043
parent9241673446c64575925e5a49e188ff6bc8c7682c (diff)
downloadshowdesktop-94b2e375d3b8692dc46468ba95489f6ee1ebbbf2.tar.gz
showdesktop-94b2e375d3b8692dc46468ba95489f6ee1ebbbf2.tar.bz2
Fix restoring window state.
-rw-r--r--showdesktop.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/showdesktop.c b/showdesktop.c
index cc5a07d..edb03da 100644
--- a/showdesktop.c
+++ b/showdesktop.c
@@ -171,6 +171,9 @@ setSDWindowHints (CompWindow *w,
if (enterSDMode)
{
+ sw->wasManaged = w->managed;
+ w->managed = FALSE;
+
sw->stateMask = state & CompWindowStateSkipPagerMask;
state |= CompWindowStateSkipPagerMask;
sw->notAllowedMask = CompWindowActionMoveMask |
@@ -178,20 +181,15 @@ setSDWindowHints (CompWindow *w,
}
else
{
+ w->managed = sw->wasManaged;
+
state &= ~CompWindowStateSkipPagerMask;
state |= (sw->stateMask & CompWindowStateSkipPagerMask);
sw->notAllowedMask = 0;
+ sw->stateMask = 0;
}
changeWindowState (w, state);
-
- if (enterSDMode)
- {
- sw->wasManaged = w->managed;
- w->managed = FALSE;
- }
- else
- w->managed = sw->wasManaged;
}
static void