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

List:       kde-commits
Subject:    kdebase/kicker
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2005-03-01 21:14:36
Message-ID: 20050301211436.33A7516EF1 () office ! kde ! org
[Download RAW message or body]

CVS commit by aseigo: 

i was hoping to not have to special case the kickertip window in
showdesktop, but as the number of ways people find to trigger misbehaviours
between them grows, it seems it's better to just givein ...

should be backported (for 3.4.1?)

BUG:100593


  M +12 -0     core/showdesktop.cpp   1.12
  M +5 -0      share/kickertip.cpp   1.12


--- kdebase/kicker/core/showdesktop.cpp  #1.11:1.12
@@ -111,7 +111,19 @@ void ShowDesktop::showDesktop( bool b )
         QValueList<WId>::ConstIterator it;
 
+        WId kickerTip = 0;
+        if (KickerSettings::showMouseOverEffects())
+        {
+            kickerTip = KickerTip::the()->winId();
+        }
+
         for (it = windows.begin(); it != windows.end(); ++it)
         {
             WId w = *it;
+
+            if (w == kickerTip)
+            {
+                continue;
+            }
+
             NETWinInfo info( qt_xdisplay(), w, qt_xrootwin(),
                              NET::XAWMState | NET::WMDesktop );

--- kdebase/kicker/share/kickertip.cpp  #1.11:1.12
@@ -74,4 +74,9 @@ void KickerTip::display(const QString& t
                         int durationMs)
 {
+    if (!tippingEnabled())
+    {
+        return;
+    }
+
     delete m_richText;
     m_richText = new QSimpleRichText("<qt><nobr><h3>" + title + "</h3><p>" +


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