jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-01 11:03:54 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

stop card tap/untap animation in CardItem::resetState() to avoid unfinished animation during zone change

Browse source
This commit is contained in:
Max-Wilhelm Bruker 2011-12-04 14:51:24 +01:00
parent eb6520a737
commit ca3a7e69a1
3 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cockatrice/src/carditem.cpp
View file

@ -2,8 +2,8 @@
#include <QPainter> #include <QPainter>
#include <QMenu> #include <QMenu>
#include <QAction> #include <QAction>
#include <QGraphicsScene>
#include <QGraphicsSceneMouseEvent> #include <QGraphicsSceneMouseEvent>
#include "gamescene.h"
#include "carditem.h" #include "carditem.h"
#include "carddragitem.h" #include "carddragitem.h"
#include "carddatabase.h" #include "carddatabase.h"
@ -369,6 +369,8 @@ void CardItem::resetState()
attachedCards.clear(); attachedCards.clear();
setTapped(false, false); setTapped(false, false);
setDoesntUntap(false); setDoesntUntap(false);
if (scene())
static_cast<GameScene *>(scene())->unregisterAnimationItem(this);
update(); update();
} }

7
cockatrice/src/gamescene.cpp
View file

@ -262,6 +262,13 @@ void GameScene::registerAnimationItem(AbstractCardItem *card)
animationTimer->start(50, this); animationTimer->start(50, this);
} }
void GameScene::unregisterAnimationItem(AbstractCardItem *card)
{
cardsToAnimate.remove(static_cast<CardItem *>(card));
if (cardsToAnimate.isEmpty())
animationTimer->stop();
}
void GameScene::startRubberBand(const QPointF &selectionOrigin) void GameScene::startRubberBand(const QPointF &selectionOrigin)
{ {
emit sigStartRubberBand(selectionOrigin); emit sigStartRubberBand(selectionOrigin);

1
cockatrice/src/gamescene.h
View file

@ -42,6 +42,7 @@ public:
void stopRubberBand(); void stopRubberBand();
void registerAnimationItem(AbstractCardItem *item); void registerAnimationItem(AbstractCardItem *item);
void unregisterAnimationItem(AbstractCardItem *card);
public slots: public slots:
void toggleZoneView(Player *player, const QString &zoneName, int numberCards); void toggleZoneView(Player *player, const QString &zoneName, int numberCards);
void addRevealedZoneView(Player *player, CardZone *zone, const QList<ServerInfo_Card *> &cardList); void addRevealedZoneView(Player *player, CardZone *zone, const QList<ServerInfo_Card *> &cardList);