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

List:       kde-commits
Subject:    KDE/kdebase/workspace/plasma/desktop/shell
From:       Marco Martin <notmart () gmail ! com>
Date:       2011-01-03 13:51:29
Message-ID: 20110103135129.3D06EAC8AE () svn ! kde ! org
[Download RAW message or body]

SVN commit 1211269 by mart:

delay activation so that the window uniconify and controller activation is done in \
the right order: the window doesn't hide anymore BUG:261877


 M  +4 -0      controllerwindow.cpp  
 M  +1 -0      controllerwindow.h  
 M  +1 -1      plasmaapp.cpp  


--- trunk/KDE/kdebase/workspace/plasma/desktop/shell/controllerwindow.cpp \
#1211268:1211269 @@ -114,6 +114,10 @@
     delete m_view;
 }
 
+void ControllerWindow::activate()
+{
+    KWindowSystem::activateWindow(winId());
+}
 
 void ControllerWindow::adjustAndSetMaxSize()
 {
--- trunk/KDE/kdebase/workspace/plasma/desktop/shell/controllerwindow.h \
#1211268:1211269 @@ -68,6 +68,7 @@
     void setScreen(int screen);
 
 public Q_SLOTS:
+    void activate();
     void showWidgetExplorer();
     void showActivityManager();
     void closeIfNotFocussed();
--- trunk/KDE/kdebase/workspace/plasma/desktop/shell/plasmaapp.cpp #1211268:1211269
@@ -530,7 +530,7 @@
     controller->show();
     Plasma::WindowEffects::slideWindow(controller, Plasma::BottomEdge);
     KWindowSystem::setOnAllDesktops(controller->winId(), true);
-    KWindowSystem::activateWindow(controller->winId());
+    QTimer::singleShot(0, controller, SLOT(activate()));
     KWindowSystem::setState(controller->winId(), NET::SkipTaskbar | NET::SkipPager | \
NET::Sticky | NET::KeepAbove);  return controller;
 }


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