jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-12 17:14:52 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

add padding to right side of card reveal window (#5198)

Browse source
This commit is contained in:
RickyRister 2024-11-26 21:17:37 -08:00 • committed by GitHub
parent 0ca8bdb3a8
commit f2b0fa164e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
cockatrice/src/game/zones/view_zone.cpp
View file

@ -145,28 +145,29 @@ void ZoneViewZone::reorganizeCards()
} }
lastCardType = cardType; lastCardType = cardType;
qreal x = 7 + (typeColumn * CARD_WIDTH); qreal x = typeColumn * CARD_WIDTH;
qreal y = typeRow * CARD_HEIGHT / 3; qreal y = typeRow * CARD_HEIGHT / 3;
c->setPos(x + 5, y + 5); c->setPos(HORIZONTAL_PADDING + x, VERTICAL_PADDING + y);
c->setRealZValue(i); c->setRealZValue(i);
longestRow = qMax(typeRow, longestRow); longestRow = qMax(typeRow, longestRow);
} }
} else { } else {
for (int i = 0; i < cardCount; i++) { for (int i = 0; i < cardCount; i++) {
CardItem *c = cardsToDisplay.at(i); CardItem *c = cardsToDisplay.at(i);
qreal x = 7 + ((i / rows) * CARD_WIDTH); qreal x = (i / rows) * CARD_WIDTH;
qreal y = (i % rows) * CARD_HEIGHT / 3; qreal y = (i % rows) * CARD_HEIGHT / 3;
c->setPos(x + 5, y + 5); c->setPos(HORIZONTAL_PADDING + x, VERTICAL_PADDING + y);
c->setRealZValue(i); c->setRealZValue(i);
} }
} }
int totalRows = (pileView && sortByType) ? longestRow : rows;
int totalColumns = (pileView && sortByType) ? qMax(typeColumn + 1, 3) : qMax(cols, 1);
qreal aleft = 0; qreal aleft = 0;
qreal atop = 0; qreal atop = 0;
qreal awidth = (pileView && sortByType) ? qMax(typeColumn + 1, 3) * CARD_WIDTH + (CARD_WIDTH / 2) qreal awidth = totalColumns * CARD_WIDTH + (CARD_WIDTH / 2) + HORIZONTAL_PADDING;
: qMax(cols, 1) * CARD_WIDTH + (CARD_WIDTH / 2); qreal aheight = (totalRows * CARD_HEIGHT) / 3 + CARD_HEIGHT * 1.3;
qreal aheight = (pileView && sortByType) ? (longestRow * CARD_HEIGHT) / 3 + CARD_HEIGHT * 1.3
: (rows * CARD_HEIGHT) / 3 + CARD_HEIGHT * 1.3;
optimumRect = QRectF(aleft, atop, awidth, aheight); optimumRect = QRectF(aleft, atop, awidth, aheight);
updateGeometry(); updateGeometry();

3
cockatrice/src/game/zones/view_zone.h
View file

@ -15,6 +15,9 @@ class ZoneViewZone : public SelectZone, public QGraphicsLayoutItem
Q_OBJECT Q_OBJECT
Q_INTERFACES(QGraphicsLayoutItem) Q_INTERFACES(QGraphicsLayoutItem)
private: private:
static constexpr int HORIZONTAL_PADDING = 12;
static constexpr int VERTICAL_PADDING = 5;
QRectF bRect, optimumRect; QRectF bRect, optimumRect;
int minRows, numberCards; int minRows, numberCards;
void handleDropEvent(const QList<CardDragItem *> &dragItems, CardZone *startZone, const QPoint &dropPoint); void handleDropEvent(const QList<CardDragItem *> &dragItems, CardZone *startZone, const QPoint &dropPoint);