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

List:       kde-commits
Subject:    KDE/kdebase/workspace/plasma/desktop/applets/tasks
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2010-12-07 18:53:37
Message-ID: 20101207185337.E0B8AAC8A5 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1204524 by aseigo:

* reset timerIds that weren't
* don't set the geometry only to then set the position again


 M  +8 -2      abstracttaskitem.cpp  


--- trunk/KDE/kdebase/workspace/plasma/desktop/applets/tasks/abstracttaskitem.cpp #1204523:1204524
@@ -339,6 +339,7 @@
     if (w && this != m_applet->rootGroupItem()) {
         if (m_hoverEffectTimerId) {
             killTimer(m_hoverEffectTimerId);
+            m_hoverEffectTimerId = 0;
         }
 
         m_hoverEffectTimerId = startTimer(HOVER_EFFECT_TIMEOUT);
@@ -902,6 +903,7 @@
 
     if (m_activateTimerId) {
         killTimer(m_activateTimerId);
+        m_activateTimerId = 0;
     }
 }
 
@@ -971,6 +973,7 @@
     if (m_lastGeometryUpdate.elapsed() < 500) {
         if (m_updateGeometryTimerId) {
             killTimer(m_updateGeometryTimerId);
+            m_updateGeometryTimerId = 0;
         }
 
         m_updateGeometryTimerId = startTimer(500 - m_lastGeometryUpdate.elapsed());
@@ -979,16 +982,19 @@
         m_lastGeometryUpdate.restart();
     }
 
-    QGraphicsWidget::setGeometry(geometry);
     //TODO:remove when we will have proper animated layouts
     if (m_firstGeometryUpdate && !m_layoutAnimationLock) {
+        QRectF animStartGeom(oldPos, geometry.size());
+        QGraphicsWidget::setGeometry(animStartGeom);
+
         if (m_layoutAnimation->state() == QAbstractAnimation::Running) {
             m_layoutAnimation->stop();
         }
 
-        setPos(oldPos);
         m_layoutAnimation->setEndValue(geometry.topLeft());
         m_layoutAnimation->start();
+    } else {
+        QGraphicsWidget::setGeometry(geometry);
     }
 }
 
[prev in list] [next in list] [prev in thread] [next in thread]