animation bugfix when show cards during fade-out animation

2010-08-07 21:06:42 +00:00
parent 6a206c0669
commit 413e32f916
3 changed files with 19 additions and 7 deletions
@@ -59,6 +59,15 @@ void MyCardsPixmapLabel::startFadeOut(int speed) {
 	
 }

+void MyCardsPixmapLabel::stopFadeOut() {
+
+        fadeOutTimer->stop();
+        fadeOutAction = FALSE;
+        frameOpacity = 1.0;
+        update();
+}
+
+

 void MyCardsPixmapLabel::nextFadeOutFrame() {

@@ -76,6 +85,8 @@ void MyCardsPixmapLabel::nextFadeOutFrame() {

 void MyCardsPixmapLabel::startFlipCards(int speed, const QPixmap &frontPix, const QPixmap &flipsidePix) { 
 	
+        stopFadeOut();
+
 	stopFlipCards = FALSE;
        isFlipside = FALSE;

@@ -36,6 +36,7 @@ public:
 	bool getFadeOutAction() const { return fadeOutAction;}
 	
 	void startFadeOut(int);
+        void stopFadeOut();
 	void startFlipCards(int, const QPixmap & , const QPixmap &);
 	void stopFlipCardsAnimation();