diff --git a/cockatrice/src/abstractgraphicsitem.h b/cockatrice/src/abstractgraphicsitem.h index dfed13e0..ff13ff4f 100644 --- a/cockatrice/src/abstractgraphicsitem.h +++ b/cockatrice/src/abstractgraphicsitem.h @@ -8,7 +8,8 @@ enum GraphicsItemType { typeCardDrag = QGraphicsItem::UserType + 2, typeZone = QGraphicsItem::UserType + 3, typePlayerTarget = QGraphicsItem::UserType + 4, - typeOther = QGraphicsItem::UserType + 5 + typeDeckViewCardContainer = QGraphicsItem::UserType + 5, + typeOther = QGraphicsItem::UserType + 6 }; class AbstractGraphicsItem : public QGraphicsItem { diff --git a/cockatrice/src/deckview.cpp b/cockatrice/src/deckview.cpp index 16cea1d0..87b0c52b 100644 --- a/cockatrice/src/deckview.cpp +++ b/cockatrice/src/deckview.cpp @@ -5,9 +5,10 @@ #include "carddatabase.h" #include "settingscache.h" #include "main.h" +#include DeckViewCardDragItem::DeckViewCardDragItem(DeckViewCard *_item, const QPointF &_hotSpot, AbstractCardDragItem *parentDrag) - : AbstractCardDragItem(_item, _hotSpot, parentDrag) + : AbstractCardDragItem(_item, _hotSpot, parentDrag), currentZone(0) { } @@ -22,6 +23,7 @@ void DeckViewCardDragItem::updatePosition(const QPointF &cursorScenePos) if (!cursorZone) return; currentZone = cursorZone; + qDebug() << currentZone; QPointF newPos = cursorScenePos; if (newPos != pos()) { @@ -119,6 +121,7 @@ void DeckViewCard::mouseMoveEvent(QGraphicsSceneMouseEvent *event) DeckViewCardContainer::DeckViewCardContainer(const QString &_name) : QGraphicsItem(), name(_name), width(0), height(0), maxWidth(0) { + qDebug() << "CardContainer constructor: name=" << _name << "; this=" << this; QString bgPath = settingsCache->getTableBgPath(); if (!bgPath.isEmpty()) bgPixmap.load(bgPath); diff --git a/cockatrice/src/deckview.h b/cockatrice/src/deckview.h index 987a2290..77c2453c 100644 --- a/cockatrice/src/deckview.h +++ b/cockatrice/src/deckview.h @@ -49,6 +49,8 @@ private: QPixmap bgPixmap; static const int rowSpacing = 5; public: + enum { Type = typeDeckViewCardContainer }; + int type() const { return Type; } DeckViewCardContainer(const QString &_name); QRectF boundingRect() const; void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);