summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/window.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/window.cpp b/src/window.cpp
index f3c2c9a..e07456f 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -644,6 +644,7 @@ void
Aquamarine::Window::setDesktop (int desktop)
{
KWin::setOnDesktop (mClientId, desktop);
+ mDecor->desktopChange ();
}
void
@@ -1550,9 +1551,12 @@ void
Aquamarine::Window::handleDesktopPopupActivated (int id)
{
if (id)
- setDesktop (id);
+ setDesktop (id);
else
- KWin::setOnAllDesktops (mClientId, true);
+ {
+ setDesktop ((desktop () == NET::OnAllDesktops) ?
+ KWin::currentDesktop() : NET::OnAllDesktops);
+ }
}
void