aquamarine: fixed "On all viewports" option with "Sticky" wm state

1 files changed, 7 insertions, 2 deletions

diff --git a/src/window.cpp b/src/window.cpp
index 42a46c8..f3c2c9a 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -1594,7 +1594,7 @@ Aquamarine::Window::handlePopupAboutToShow (void)
 		mPopup->setItemVisible (Options::NoOp, false);
 	}
 
-	mViewportMenu->setItemChecked (0, desktop () == NET::OnAllDesktops);
+	mViewportMenu->setItemChecked (0, mState & NET::Sticky);
 	for (int i = 1;i <=
 			Decorator::viewports ().width () * Decorator::viewports ().height ();
 			++i)
@@ -2071,7 +2071,12 @@ Aquamarine::Window::hideKillProcessDialog (void)
 void Aquamarine::Window::handleChangeViewport (int id)
 {
 	if (id == 0)
-		setDesktop ((desktop () == NET::OnAllDesktops) ? 1 : NET::OnAllDesktops);
+	{
+	    if (mState & NET::Sticky)
+		KWin::clearState(mClientId, NET::Sticky);
+	    else
+		KWin::setState(mClientId, NET::Sticky);
+	}
 	else
 		Decorator::moveToViewport (mClientId, id);
 }