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

List:       kde-commits
Subject:    KDE/kdegames
From:       Dmitry Suzdalev <dimsuz () gmail ! com>
Date:       2007-06-01 12:45:33
Message-ID: 1180701933.006691.18056.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 670437 by dimsuz:

klines: few fixes, related to theme selection support
katomic: remove unused header


 M  +1 -0      katomic/playfield.cpp  
 M  +0 -1      katomic/playfield.h  
 M  +16 -9     klines/animator.cpp  


--- trunk/KDE/kdegames/katomic/playfield.cpp #670436:670437
@@ -26,6 +26,7 @@
 #include <QGraphicsSceneMouseEvent>
 #include <QResizeEvent>
 #include <QTimeLine>
+#include <QPainter>
 
 #include <kstandarddirs.h>
 #include <kconfig.h>
--- trunk/KDE/kdegames/katomic/playfield.h #670436:670437
@@ -23,7 +23,6 @@
 #ifndef PLAYFIELD_H
 #define PLAYFIELD_H
 #include <QGraphicsScene>
-#include <QGraphicsView>
 #include <QList>
 #include <QStack>
 
--- trunk/KDE/kdegames/klines/animator.cpp #670436:670437
@@ -56,23 +56,16 @@
 KLinesAnimator::KLinesAnimator( KLinesScene* scene )
     : m_scene(scene), m_movingBall(0)
 {
+    // timing & framing setup is done in corresponding animate* functions
+
     connect(&m_moveTimeLine, SIGNAL(frameChanged(int)), SLOT(moveAnimationFrame(int)) );
     connect(&m_moveTimeLine, SIGNAL(finished()), SIGNAL(moveFinished()));
 
-    m_removeTimeLine.setDuration(KLinesRenderer::self()->dieAnimDuration());
     m_removeTimeLine.setCurveShape(QTimeLine::LinearCurve);
-    // we setup here one 'empty' frame at the end, because without it
-    // m_scene will delete 'burned' items in removeAnimFinished() slot so quickly
-    // that last frame won't get shown in the scene
-    m_removeTimeLine.setFrameRange(0, KLinesRenderer::self()->numDieFrames());
-
     connect(&m_removeTimeLine, SIGNAL(frameChanged(int)), SLOT(removeAnimationFrame(int)) );
     connect(&m_removeTimeLine, SIGNAL(finished()), SIGNAL(removeFinished()));
 
-    m_bornTimeLine.setDuration(KLinesRenderer::self()->bornAnimDuration());
     m_bornTimeLine.setCurveShape(QTimeLine::LinearCurve);
-    m_bornTimeLine.setFrameRange(0, KLinesRenderer::self()->numBornFrames()-1);
-
     connect(&m_bornTimeLine, SIGNAL(frameChanged(int)), SLOT(bornAnimationFrame(int)) );
     connect(&m_bornTimeLine, SIGNAL(finished()), SIGNAL(bornFinished()));
 }
@@ -116,12 +109,26 @@
     }
 
     m_removedBalls = list;
+
+    // called here (not in constructor), to stay in sync in case theme's reloaded
+    m_removeTimeLine.setDuration(KLinesRenderer::self()->dieAnimDuration());
+    // we setup here one 'empty' frame at the end, because without it
+    // m_scene will delete 'burned' items in removeAnimFinished() slot so quickly
+    // that last frame won't get shown in the scene
+    m_removeTimeLine.setFrameRange(0, KLinesRenderer::self()->numDieFrames());
+
     m_removeTimeLine.start();
 }
 
 void KLinesAnimator::animateBorn( const QList<BallItem*>& list )
 {
     m_bornBalls = list;
+
+    // called here (not in constructor), to stay in sync in case theme's reloaded
+    m_bornTimeLine.setDuration(KLinesRenderer::self()->bornAnimDuration());
+    m_bornTimeLine.setFrameRange(0, KLinesRenderer::self()->numBornFrames()-1);
+
+    m_bornTimeLine.setCurrentTime( 0 );
     m_bornTimeLine.start();
 }
 
[prev in list] [next in list] [prev in thread] [next in thread]