From b47b0e881cfb252b3294ba50a8f2a3612b3f6feb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= <l.lunak@kde.org>
Date: Fri, 28 Jan 2005 13:44:08 +0000
Subject: [PATCH] Cancel shade hover if the user changes shade state. BUG:
 96921

svn path=/trunk/kdebase/kwin/; revision=383251
---
 useractions.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/useractions.cpp b/useractions.cpp
index a894630380..c0887d07dd 100644
--- a/useractions.cpp
+++ b/useractions.cpp
@@ -383,7 +383,7 @@ void Workspace::performWindowOperation( Client* c, Options::WindowOperation op )
             c->minimize();
             break;
         case Options::ShadeOp:
-            c->toggleShade();
+            c->performMouseCommand( Options::MouseShade, QCursor::pos());
             break;
         case Options::OnAllDesktopsOp:
             c->setOnAllDesktops( !c->isOnAllDesktops() );
@@ -429,6 +429,8 @@ bool Client::performMouseCommand( Options::MouseCommand command, QPoint globalPo
             workspace()->lowerClient( this );
             break;
         case Options::MouseShade :
+            delete shadeHoverTimer;
+            shadeHoverTimer = 0;
             toggleShade();
             break;
         case Options::MouseOperationsMenu: