[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdebase/kicker/core
From:       Luboš Luňák <l.lunak () kde ! org>
Date:       2004-04-29 15:36:12
Message-ID: 20040429153612.2FA6F9099 () office ! kde ! org
[Download RAW message or body]

CVS commit by lunakl: 

Make the previously active window active again when cancelling show desktop
state.
CCMAIL: 64972-done@bugs.kde.org


  M +2 -0      showdesktop.cpp   1.4
  M +1 -0      showdesktop.h   1.2


--- kdebase/kicker/core/showdesktop.cpp  #1.3:1.4
@@ -80,4 +80,5 @@ void ShowDesktop::showDesktop( bool b )
     if ( b ) {
         // this code should move to KWin after supporting NETWM1.2
+        activeWindow = kWinModule->activeWindow();
         iconifiedList.clear();
         const QValueList<WId> windows = kWinModule->windows();
@@ -105,4 +106,5 @@ void ShowDesktop::showDesktop( bool b )
             KWin::deIconifyWindow( *it, false  );
         }
+        KWin::forceActiveWindow( activeWindow );
     }
 

--- kdebase/kicker/core/showdesktop.h  #1.1:1.2
@@ -55,4 +55,5 @@ private:
     KWinModule*       kWinModule;
     QValueList<WId>   iconifiedList;
+    WId               activeWindow;
 
 };


[prev in list] [next in list] [prev in thread] [next in thread]