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

List:       kde-commits
Subject:    KDE/kdelibs/plasma/private
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2008-11-18 3:37:43
Message-ID: 1226979463.808000.29330.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 885897 by aseigo:

we don't need the timer on this one; it's only useful for the desktop toolbox.
BUG:167782


 M  +3 -9      paneltoolbox.cpp  


--- trunk/KDE/kdelibs/plasma/private/paneltoolbox.cpp #885896:885897
@@ -48,7 +48,6 @@
 
 
     KIcon icon;
-    QTime stopwatch;
     int animId;
     qreal animFrame;
     bool toggled;
@@ -207,7 +206,7 @@
 
 void PanelToolBox::hoverEnterEvent(QGraphicsSceneHoverEvent *event)
 {
-    if (showing() || d->stopwatch.elapsed() < 100) {
+    if (showing()) {
         QGraphicsItem::hoverEnterEvent(event);
         return;
     }
@@ -242,18 +241,15 @@
     // match whatever the time is that moveItem() takes. Same in hoverLeaveEvent().
     d->animId = animdriver->customAnimation(
         10, 240, Plasma::Animator::EaseInCurve, this, "animate");
-    d->stopwatch.restart();
 }
 
 void PanelToolBox::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
 {
     //kDebug() << event->pos() << event->scenePos()
-    if (d->stopwatch.elapsed() < 100 || d->toggled) {
-        QGraphicsItem::hoverLeaveEvent(event);
-        return;
+    if (!d->toggled) {
+        hideToolBox();
     }
 
-    hideToolBox();
     QGraphicsItem::hoverLeaveEvent(event);
 }
 
@@ -273,8 +269,6 @@
     setShowing(false);
     d->animId = animdriver->customAnimation(
         10, 240, Plasma::Animator::EaseOutCurve, this, "animate");
-
-    d->stopwatch.restart();
 }
 
 void PanelToolBox::animate(qreal progress)
[prev in list] [next in list] [prev in thread] [next in thread]