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

List:       kde-commits
Subject:    branches/KDE/4.2/kdebase/workspace/krunner/interfaces/default
From:       Luca Gugelmann <luca.gugelmann () gmail ! com>
Date:       2009-02-08 16:31:55
Message-ID: 1234110715.009052.7571.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 923352 by gugelmann:

CCBUG:177815
Fixes confused and overlapped icons in krunner which are sometimes left over
from previous queries. (backport from trunk.)


 M  +9 -4      resultitem.cpp  


--- branches/KDE/4.2/kdebase/workspace/krunner/interfaces/default/resultitem.cpp \
#923351:923352 @@ -63,7 +63,8 @@
           rowStride(6),
           highlightTimerId(0),
           animation(0),
-          needsMoving(false)
+          needsMoving(false),
+          dying(false)
     {
         if (s_fontHeight < 1) {
             //FIXME: reset when the application font changes
@@ -113,6 +114,7 @@
     QGraphicsItemAnimation *animation;
     bool isFavorite : 1;
     bool needsMoving : 1;
+    bool dying;
 };
 
 int ResultItem::Private::s_removingCount = 0;
@@ -180,9 +182,11 @@
 //void ResultItem::Private::animationComplete()
 void ResultItem::animationComplete()
 {
-    delete d->animation;
-    d->animation = 0;
-    resetTransform();
+    if(!d->dying) {
+        delete d->animation;
+        d->animation = 0;
+        resetTransform();
+    }
 }
 
 ResultItem::ResultItem(const Plasma::QueryMatch &match, QGraphicsWidget *parent, \
Plasma::FrameSvg *frame) @@ -387,6 +391,7 @@
     ++Private::s_removingCount;
 
     connect(timer, SIGNAL(finished()), this, SLOT(deleteLater()));
+    d->dying = true;
     timer->start();
 }
 


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