add card animations during moves

Author: juchi

abstractcardholder.h

@@ -18,10 +18,12 @@
 #ifndef ABSTRACTCARDHOLDER_H
 #define ABSTRACTCARDHOLDER_H
 
+#include <QObject>
+
 class QPoint;
 class Card;
 
-class AbstractCardHolder
+class AbstractCardHolder : public QObject
 {
 public:
     AbstractCardHolder();

board.cpp

@@ -164,7 +164,7 @@ void Board::automaticMove(Card* card)
                 bottomSpot = bottomSpot->getChild();
             }
             if (bottomSpot->canStackCard(card)) {
-                card->setParent(bottomSpot);
+                card->setParent(bottomSpot, true);
                 return;
             }
         }
@@ -173,7 +173,7 @@ void Board::automaticMove(Card* card)
     std::vector<Freecell*>::iterator itFreecell;
     for (itFreecell = mFreeCells.begin(); itFreecell < mFreeCells.end(); itFreecell++) {
         if ((*itFreecell)->isEmpty()) {
-            card->setParent(*itFreecell);
+            card->setParent(*itFreecell, true);
             return;
         }
     }
@@ -230,8 +230,9 @@ void Board::selectCard(Card* card)
         if (card->isOnAceSpot()) {
             mSelectedCard->setOnAceSpot(true);
         }
-        mSelectedCard->setParent(card);
+        mSelectedCard->setParent(card, true);
     } else {
+        if (mSelectedCard) mSelectedCard->updatePosition(true);
         setSelectedCard(card);
     }
 }

card.cpp

@@ -20,6 +20,8 @@
 #include "cardproxy.h"
 #include "board.h"
 
+#include <QPropertyAnimation>
+
 #include <iostream>
 #include <sstream>
 
@@ -30,6 +32,7 @@ Card::Card(cardcolor color, cardvalue value, Board* board) : AbstractCardHolder(
     mValue = value;
     mBoard = board;
     mIsOnAceSpot = false;
+    mSelected = false;
 
     mWidget = new CardWidget();
     mWidget->setText(getLabel());
@@ -56,15 +59,15 @@ QPixmap Card::getWidgetPixmap()
     return mWidget->grab();
 }
 
-void Card::setParent(AbstractCardHolder* parent)
+void Card::setParent(AbstractCardHolder* parent, bool animate)
 {
     if (mParent) {
         mParent->setChild(0);
     }
     mParent = parent;
     if (mParent) {
         mParent->setChild(this);
-        updatePosition();
+        updatePosition(animate);
         mBoard->unselectCard();
     }
 }
@@ -203,6 +206,24 @@ QPoint Card::getPosition()
     return mPosition;
 }
 
+void Card::animatePosition(QPoint pos)
+{
+    mPosition = pos;
+    setZIndex(100);
+
+    QPropertyAnimation *animation = new QPropertyAnimation(mWidget, "pos");
+    animation->setDuration(100);
+    animation->setStartValue(mWidget->pos());
+    animation->setEndValue(mPosition);
+    animation->start(QAbstractAnimation::DeleteWhenStopped);
+
+    QObject::connect(animation, SIGNAL(finished()), this, SLOT(resetZIndex()));
+
+    if (mChild) {
+        mChild->updatePosition(true);
+    }
+}
+
 void Card::setPosition(QPoint pos)
 {
     mPosition = pos;
@@ -212,10 +233,14 @@ void Card::setPosition(QPoint pos)
     }
 }
 
-void Card::updatePosition()
+void Card::updatePosition(bool animate)
 {
-    setPosition(mParent->getChildPosition());
-    setZIndex(mParent->getZIndex() + 1);
+    if (animate) {
+        animatePosition(mParent->getChildPosition());
+    } else {
+        setPosition(mParent->getChildPosition());
+        setZIndex(mParent->getZIndex() + 1);
+    }
 }
 
 int Card::getTopZIndex()
@@ -239,6 +264,11 @@ void Card::setZIndex(int index, bool cascade)
     }
 }
 
+void Card::resetZIndex()
+{
+    setZIndex(mParent->getZIndex() + 1);
+}
+
 void Card::show()
 {
     mWidget->show();
@@ -256,13 +286,19 @@ void Card::select()
 
 void Card::setSelected(bool selected)
 {
-    if (selected) {
+    mSelected = selected;
+    if (mSelected) {
         mWidget->setStyleSheet("CardWidget {background-color:white;border: 2px solid yellow;border-radius:5px;}");
     } else {
         mWidget->setStyleSheet("CardWidget {background-color:white;border: 2px solid black;border-radius:5px;}");
     }
 }
 
+bool Card::isSelected()
+{
+    return mSelected;
+}
+
 void Card::automaticMove()
 {
     mBoard->automaticMove(this);

card.h

@@ -32,11 +32,12 @@ class QPixmap;
 
 class Card : public AbstractCardHolder
 {
+    Q_OBJECT
 public:
     Card();
     Card(cardcolor color, cardvalue value, Board* board);
 
-    void setParent(AbstractCardHolder*);
+    void setParent(AbstractCardHolder*, bool = false);
     int countChildren();
 
     bool canStackCard(Card*);
@@ -58,18 +59,23 @@ class Card : public AbstractCardHolder
 
     QPoint getPosition();
     QPoint getChildPosition();
+    void animatePosition(QPoint pos);
     void setPosition(QPoint pos);
-    void updatePosition();
+    void updatePosition(bool animate = false);
     int getTopZIndex();
     int getZIndex();
     void setZIndex(int index, bool cascade = true);
     void hide();
     void show();
 
     void select();
+    bool isSelected();
     void setSelected(bool selected);
     void automaticMove();
 
+public slots:
+    void resetZIndex();
+
 protected:
     cardcolor mColor;
     cardvalue mValue;
@@ -79,6 +85,7 @@ class Card : public AbstractCardHolder
     CardProxy* mProxy;
 
     QPoint mPosition;
+    bool mSelected;
 
     bool mIsOnAceSpot;
 

cardproxy.cpp

@@ -41,8 +41,10 @@ CardProxy::CardProxy(Card* card) :
 void CardProxy::mousePressEvent(QGraphicsSceneMouseEvent *event)
 {
     if (event->button() == Qt::LeftButton) {
-        mCard->select();
-        mCard->setZIndex(100);
+        if (!mCard->isSelected()) {
+            mCard->select();
+            mCard->setZIndex(100);
+        }
     } else if (event->button() == Qt::RightButton) {
         mCard->setZIndex(mCard->getTopZIndex(), false);
     }
@@ -66,25 +68,39 @@ void CardProxy::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
         }
     } else if (event->button() == Qt::LeftButton) {
         QList<QGraphicsItem*> items = this->scene()->items(event->scenePos());
+        bool selection = false;
+
+        // if the card is not moved enough, replace it
+        if ((event->buttonDownScenePos(Qt::LeftButton) - event->scenePos()).manhattanLength() < 10) {
+            mCard->updatePosition(true);
+            return;
+        }
 
+        // browse the items underneath
         for (int i = 0; i < items.size(); i++) {
             if (items[i] != this && items[i]->data(0) == QVariant("card")) {
                 CardProxy* proxy = dynamic_cast<CardProxy*>(items[i]);
                 if (proxy->mCard->getChild() == 0) {
                     proxy->mCard->select();
+                    selection = true;
                 }
                 break;
             } else if (items[i] != this && items[i]->data(0) == QVariant("acespot")) {
                 CardSpotProxy* proxy = dynamic_cast<CardSpotProxy*>(items[i]);
                 proxy->select();
+                selection = true;
                 break;
             } else if (items[i] != this && items[i]->data(0) == QVariant("freecell")) {
                 CardSpotProxy* proxy = dynamic_cast<CardSpotProxy*>(items[i]);
                 proxy->select();
+                selection = true;
                 break;
             }
         }
-        mCard->updatePosition();
+        // if not item matches, replace the card at it's original position
+        if (!selection) {
+            mCard->updatePosition(true);
+        }
     }
 }
 
@@ -95,6 +111,7 @@ void CardProxy::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
 void CardProxy::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
 {
     if (event->buttons() & Qt::LeftButton) {
+        mCard->setZIndex(100);
         mCard->setPosition(event->scenePos().toPoint() - event->buttonDownPos(Qt::LeftButton).toPoint());
     }
 }

cardspot.cpp

@@ -84,6 +84,9 @@ void CardSpot::select()
 {
     Card* card = mBoard->getSelectedCard();
     if (card && canStackCard(card)) {
-        card->setParent(this);
+        card->setParent(this, true);
+    } else if (card) {
+        card->updatePosition(true);
+        mBoard->unselectCard();
     }
 }