summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Spilsbury <sam.spilsbury@canonical.com>2011-02-19 01:10:08 +0800
committerSam Spilsbury <sam.spilsbury@canonical.com>2011-02-19 01:10:08 +0800
commit7400ed95255ec33e6771afa0a0c2e026ab58e2b5 (patch)
tree79d75490603a06846e4ead37e8f9357d08fddebf
parent2d2803180343211a9620f869e33a8e8f3810ad35 (diff)
downloadcompiz-with-glib-mainloop-7400ed95255ec33e6771afa0a0c2e026ab58e2b5.tar.gz
compiz-with-glib-mainloop-7400ed95255ec33e6771afa0a0c2e026ab58e2b5.tar.bz2
Map and unmap the switcher window directly
-rw-r--r--plugins/switcher/src/switcher.cpp21
1 files changed, 2 insertions, 19 deletions
diff --git a/plugins/switcher/src/switcher.cpp b/plugins/switcher/src/switcher.cpp
index 71eb54e..d8b09f2 100644
--- a/plugins/switcher/src/switcher.cpp
+++ b/plugins/switcher/src/switcher.cpp
@@ -303,13 +303,7 @@ SwitchScreen::initiate (SwitchWindowSelection selection,
if (popupWindow && showPopup)
{
- CompWindow *w;
-
- w = screen->findWindow (popupWindow);
- if (w && (w->state () & CompWindowStateHiddenMask))
- w->show ();
- else
- XMapWindow (screen->dpy (), popupWindow);
+ XMapWindow (screen->dpy (), popupWindow);
setSelectedWindowHint ();
}
@@ -357,22 +351,11 @@ switchTerminate (CompAction *action,
SWITCH_SCREEN (screen);
-
if (ss->grabIndex)
{
- CompWindow *w;
-
if (ss->popupWindow)
{
- w = screen->findWindow (ss->popupWindow);
- if (w && w->managed () && w->mapNum ())
- {
- w->hide ();
- }
- else
- {
- XUnmapWindow (screen->dpy (), ss->popupWindow);
- }
+ XUnmapWindow (screen->dpy (), ss->popupWindow);
}
ss->switching = false;