aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

sideboarding crash fix

Browse source
This commit is contained in:
Max-Wilhelm Bruker 2010-09-22 16:12:43 +02:00
parent 79a3a1a0b4
commit 235d591778
3 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cockatrice/src/abstractgraphicsitem.h
View file

@ -8,7 +8,8 @@ enum GraphicsItemType {
typeCardDrag = QGraphicsItem::UserType + 2, typeCardDrag = QGraphicsItem::UserType + 2,
typeZone = QGraphicsItem::UserType + 3, typeZone = QGraphicsItem::UserType + 3,
typePlayerTarget = QGraphicsItem::UserType + 4, typePlayerTarget = QGraphicsItem::UserType + 4,
typeOther = QGraphicsItem::UserType + 5 typeDeckViewCardContainer = QGraphicsItem::UserType + 5,
typeOther = QGraphicsItem::UserType + 6
}; };
class AbstractGraphicsItem : public QGraphicsItem { class AbstractGraphicsItem : public QGraphicsItem {

5
cockatrice/src/deckview.cpp
View file

@ -5,9 +5,10 @@
#include "carddatabase.h" #include "carddatabase.h"
#include "settingscache.h" #include "settingscache.h"
#include "main.h" #include "main.h"
#include <QDebug>
DeckViewCardDragItem::DeckViewCardDragItem(DeckViewCard *_item, const QPointF &_hotSpot, AbstractCardDragItem *parentDrag) 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) if (!cursorZone)
return; return;
currentZone = cursorZone; currentZone = cursorZone;
qDebug() << currentZone;
QPointF newPos = cursorScenePos; QPointF newPos = cursorScenePos;
if (newPos != pos()) { if (newPos != pos()) {
@ -119,6 +121,7 @@ void DeckViewCard::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
DeckViewCardContainer::DeckViewCardContainer(const QString &_name) DeckViewCardContainer::DeckViewCardContainer(const QString &_name)
: QGraphicsItem(), name(_name), width(0), height(0), maxWidth(0) : QGraphicsItem(), name(_name), width(0), height(0), maxWidth(0)
{ {
qDebug() << "CardContainer constructor: name=" << _name << "; this=" << this;
QString bgPath = settingsCache->getTableBgPath(); QString bgPath = settingsCache->getTableBgPath();
if (!bgPath.isEmpty()) if (!bgPath.isEmpty())
bgPixmap.load(bgPath); bgPixmap.load(bgPath);

2
cockatrice/src/deckview.h
View file

@ -49,6 +49,8 @@ private:
QPixmap bgPixmap; QPixmap bgPixmap;
static const int rowSpacing = 5; static const int rowSpacing = 5;
public: public:
enum { Type = typeDeckViewCardContainer };
int type() const { return Type; }
DeckViewCardContainer(const QString &_name); DeckViewCardContainer(const QString &_name);
QRectF boundingRect() const; QRectF boundingRect() const;
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget); void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);