boardcards animation hanging gfx bugfix
This commit is contained in:
@@ -2092,6 +2092,7 @@ void mainWindowImpl::nextRoundCleanGui() {
|
|||||||
for (i=0; i<5; i++ ) {
|
for (i=0; i<5; i++ ) {
|
||||||
boardCardsArray[i]->setPixmap(onePix, FALSE);
|
boardCardsArray[i]->setPixmap(onePix, FALSE);
|
||||||
boardCardsArray[i]->setFadeOutAction(FALSE);
|
boardCardsArray[i]->setFadeOutAction(FALSE);
|
||||||
|
boardCardsArray[i]->stopFlipCardsAnimation();
|
||||||
|
|
||||||
}
|
}
|
||||||
for (i=0; i<MAX_NUMBER_OF_PLAYERS; i++ ) {
|
for (i=0; i<MAX_NUMBER_OF_PLAYERS; i++ ) {
|
||||||
|
|||||||
@@ -74,6 +74,8 @@ void MyCardsPixmapLabel::nextFadeOutFrame() {
|
|||||||
|
|
||||||
void MyCardsPixmapLabel::startFlipCards(int speed, QPixmap frontPix, QPixmap *flipsidePix) {
|
void MyCardsPixmapLabel::startFlipCards(int speed, QPixmap frontPix, QPixmap *flipsidePix) {
|
||||||
|
|
||||||
|
stopFlipCards = FALSE;
|
||||||
|
|
||||||
QLabel::setPixmap(frontPix);
|
QLabel::setPixmap(frontPix);
|
||||||
|
|
||||||
frameFlipCardsAction1Size = 1.0;
|
frameFlipCardsAction1Size = 1.0;
|
||||||
@@ -95,6 +97,15 @@ void MyCardsPixmapLabel::startFlipCards(int speed, QPixmap frontPix, QPixmap *fl
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void MyCardsPixmapLabel::stopFlipCardsAnimation() {
|
||||||
|
|
||||||
|
flipCardsTimer->stop();
|
||||||
|
flipCardsAction1 = FALSE;
|
||||||
|
flipCardsAction2 = FALSE;
|
||||||
|
stopFlipCards = TRUE;
|
||||||
|
update();
|
||||||
|
}
|
||||||
|
|
||||||
void MyCardsPixmapLabel::nextFlipCardsFrame() {
|
void MyCardsPixmapLabel::nextFlipCardsFrame() {
|
||||||
|
|
||||||
if (frameFlipCardsAction1Size > 0.1 ) {
|
if (frameFlipCardsAction1Size > 0.1 ) {
|
||||||
|
|||||||
@@ -33,6 +33,7 @@ public:
|
|||||||
|
|
||||||
void startFadeOut(int);
|
void startFadeOut(int);
|
||||||
void startFlipCards(int, QPixmap, QPixmap*);
|
void startFlipCards(int, QPixmap, QPixmap*);
|
||||||
|
void stopFlipCardsAnimation();
|
||||||
|
|
||||||
void paintEvent(QPaintEvent * event);
|
void paintEvent(QPaintEvent * event);
|
||||||
|
|
||||||
@@ -66,6 +67,7 @@ private:
|
|||||||
bool fadeOutAction;
|
bool fadeOutAction;
|
||||||
bool flipCardsAction1;
|
bool flipCardsAction1;
|
||||||
bool flipCardsAction2;
|
bool flipCardsAction2;
|
||||||
|
bool stopFlipCards;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
Reference in New Issue
Block a user