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

List:       kde-commits
Subject:    branches/KDE/4.2/kdelibs/plasma
From:       Aurélien Gâteau <agateau () kde ! org>
Date:       2009-03-30 10:35:36
Message-ID: 1238409336.862497.31700.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 946770 by gateau:

Use Qt::Tool window flags for popups to avoid having them shown over screensaver.

CCBUG:179924

 M  +5 -2      popupapplet.cpp  


--- branches/KDE/4.2/kdelibs/plasma/popupapplet.cpp #946769:946770
@@ -275,7 +275,8 @@
                 //stuff out of your Dialog (extenders). Monitor WindowDeactivate events so we can
                 //emulate the same kind of behavior as Qt::Popup (close when you click somewhere
                 //else.
-                Qt::WindowFlags wflags = Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint;
+                //Use Qt::Tool otherwise dialogs get shown over screensaver (bug #179924).
+                Qt::WindowFlags wflags = Qt::Tool | Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint;
 
                 if (passive) {
                     wflags |= Qt::X11BypassWindowManagerHint;
@@ -410,10 +411,12 @@
     d->passive = passive;
 
     if (d->dialog) {
-        Qt::WindowFlags wflags = Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint;
+        Qt::WindowFlags wflags = d->dialog->windowFlags();
 
         if (d->passive) {
             wflags |= Qt::X11BypassWindowManagerHint;
+        } else {
+            wflags &= ~Qt::X11BypassWindowManagerHint;
         }
 
         d->dialog->setWindowFlags(wflags);
[prev in list] [next in list] [prev in thread] [next in thread]