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

fixed dynamic table resizing

Browse source
This commit is contained in:
Max-Wilhelm Bruker 2009-09-09 15:48:56 +02:00
parent cd13583619
commit aa9ebd3179
5 changed files with 28 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cockatrice/src/cardzone.cpp
View file

@ -69,7 +69,7 @@ CardItem *CardZone::getCard(int cardId, const QString &cardName)
return c;
}
CardItem *CardZone::takeCard(int position, int cardId, const QString &cardName)
CardItem *CardZone::takeCard(int position, int cardId, const QString &cardName, bool /*canResize*/)
{
Q_ASSERT(position < cards.size());

2
cockatrice/src/cardzone.h
View file

@ -44,7 +44,7 @@ public:
// getCard() finds a card by id.
CardItem *getCard(int cardId, const QString &cardName);
// takeCard() finds a card by position and removes it from the zone and from all of its views.
virtual CardItem *takeCard(int position, int cardId, const QString &cardName);
virtual CardItem *takeCard(int position, int cardId, const QString &cardName, bool canResize = true);
void setCardAttr(int cardId, const QString &aname, const QString &avalue);
ZoneViewZone *getView() const { return view; }
void setView(ZoneViewZone *_view);

2
cockatrice/src/player.cpp
View file

@ -332,7 +332,7 @@ void Player::gameEvent(const ServerEventData &event)
position = 0;
if (x == -1)
x = 0;
CardItem *card = startZone->takeCard(position, cardId, cardName);
CardItem *card = startZone->takeCard(position, cardId, cardName, startZone != targetZone);
if (!card) // XXX
qDebug("moveCard: card not found");

58
cockatrice/src/tablezone.cpp
View file

@ -16,7 +16,7 @@ TableZone::TableZone(Player *_p, QGraphicsItem *parent)
height = 14.0 / 3 * CARD_HEIGHT + 3 * paddingY;
else
height = 4 * CARD_HEIGHT + 3 * paddingY;
width = minWidth * CARD_WIDTH / 2;
width = minWidth + 2 * marginX;
setCacheMode(DeviceCoordinateCache);
setAcceptsHoverEvents(true);
@ -29,25 +29,6 @@ QRectF TableZone::boundingRect() const
void TableZone::paint(QPainter *painter, const QStyleOptionGraphicsItem */*option*/, QWidget */*widget*/)
{
/*
// DEBUG
painter->fillRect(boundingRect(), Qt::black);
for (int i = 0; i < width; i += 2)
for (int j = 0; j < height; j += 2) {
// QPointF p = closestGridPoint(QPointF(i, j));
QPoint p = mapToGrid(QPointF(i, j));
QColor c;
// c.setHsv(p.x() / 2, p.y() / 3, 255);
c.setHsv(p.x() * 12, p.y() * 80, 255);
painter->setPen(c);
painter->setBrush(c);
painter->drawRect(i, j, 2, 2);
}
painter->setPen(Qt::black);
painter->drawLine(QPointF(0, 366), QPointF(1000, 366));
// DEBUG Ende
*/
if (bgPixmap.isNull())
painter->fillRect(boundingRect(), QColor(0, 0, 100));
else
@ -60,18 +41,14 @@ void TableZone::addCardImpl(CardItem *card, int _x, int _y)
qreal x = mapPoint.x();
qreal y = mapPoint.y();
if (x >= width - marginX - 2 * CARD_WIDTH) {
width += 2 * CARD_WIDTH;
emit sizeChanged();
}
cards.append(card);
// if ((x != -1) && (y != -1)) {
if (!player->getLocal())
y = height - CARD_HEIGHT - y;
card->setPos(x, y);
// }
if (!player->getLocal())
y = height - CARD_HEIGHT - y;
card->setPos(x, y);
card->setGridPoint(QPoint(_x, _y));
resizeToContents();
card->setZValue((y + CARD_HEIGHT) * 10000000 + x + 1000);
card->setParentItem(this);
card->setVisible(true);
@ -108,21 +85,30 @@ void TableZone::toggleTapped()
}
}
CardItem *TableZone::takeCard(int position, int cardId, const QString &cardName)
CardItem *TableZone::takeCard(int position, int cardId, const QString &cardName, bool canResize)
{
CardItem *result = CardZone::takeCard(position, cardId, cardName);
if (canResize)
resizeToContents();
return result;
}
void TableZone::resizeToContents()
{
qDebug("resizeToContents");
int xMax = 0;
for (int i = 0; i < cards.size(); ++i)
if (cards[i]->getGridPoint().x() > xMax)
xMax = cards[i]->getGridPoint().x();
if (cards[i]->pos().x() > xMax)
xMax = cards[i]->pos().x();
qDebug(QString("xMax = %1").arg(xMax).toLatin1());
xMax += 2 * CARD_WIDTH;
if (xMax < minWidth)
xMax = minWidth;
int newWidth = (xMax + 1) * CARD_WIDTH / 2 + 2 * marginX;
if (newWidth < width - 2 * CARD_WIDTH) {
int newWidth = xMax + 2 * marginX;
if (newWidth != width) {
width = newWidth;
emit sizeChanged();
}
return result;
}
CardItem *TableZone::getCardFromGrid(const QPoint &gridPoint) const

5
cockatrice/src/tablezone.h
View file

@ -14,7 +14,7 @@ private:
public:
static const int paddingY = 20;
static const int marginX = 20;
static const int minWidth = 20;
static const int minWidth = 20 * CARD_WIDTH / 2;
TableZone(Player *_p, QGraphicsItem *parent = 0);
QRectF boundingRect() const;
@ -28,7 +28,8 @@ public:
QPoint mapToGrid(const QPointF &mapPoint) const;
QPoint getFreeGridPoint(int row) const;
QPointF closestGridPoint(const QPointF &point);
CardItem *takeCard(int position, int cardId, const QString &cardName);
CardItem *takeCard(int position, int cardId, const QString &cardName, bool canResize = true);
void resizeToContents();
protected:
void addCardImpl(CardItem *card, int x, int y);
};