jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-11-09 19:43:26 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

[Client] Preview token edits live and preserve custom drafts (#7737)

Browse source 
* Preview token edits live and preserve custom drafts

* Restore the upstream reveal-random-hand-cards action

The rebase onto upstream/master took the PR side of player_actions.cpp and
dropped PlayerActions::actRevealRandomHandCards, which upstream added after
the PR merge base. Re-apply the face-down P/T fix on the current file so the
branch keeps both changes.

* Draw the token preview P/T as the hover-panel pill

The preview painted the name and P/T unconditionally: the name duplicated the
artwork, and the raw P/T text was drawn even when it matched the printed value,
which looked wrong at non-default dialog sizes.

- Suppress the card name over a token picture via a small AbstractCardItem hook;
  cards without art still show it.
- Draw only a P/T that differs from the printed getPowTough() as the #7700
  hover-panel pill: dark rounded scrim, bold white text, anchored on the printed
  P/T box and clamped inside the card.
- Use designated CardRef initializers in the new code.

The face-up draft still previews while face-down creation is selected.

---------

Co-authored-by: Lukas Brübach <44814898+BruebachL@users.noreply.github.com>
This commit is contained in:
Bryce! 2026-11-09 06:59:53 -05:00 • committed by GitHub
parent 3f3aff9408
commit 3d8c729517
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 323 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

8
cockatrice/src/game_graphics/board/abstract_card_item.cpp
View file

@ -181,6 +181,11 @@ QSizeF AbstractCardItem::getTranslatedSize(QPainter *painter) const
painter->combinedTransform().map(QLineF(0, 0, 0, boundingRect().height())).length());
}
bool AbstractCardItem::shouldPaintNameOverPicture() const
{
return SettingsCache::instance().cardsDisplay().getDisplayCardNames();
}
void AbstractCardItem::transformPainter(QPainter *painter, const QSizeF &translatedSize, int angle)
{
const int MAX_FONT_SIZE = SettingsCache::instance().appearance().getMaxFontSize();
@ -233,8 +238,7 @@ void AbstractCardItem::paintPicture(QPainter *painter, const QSizeF &translatedS
painter->drawPath(shape());
}
if (translatedPixmap.isNull() || SettingsCache::instance().cardsDisplay().getDisplayCardNames() ||
state->getFaceDown()) {
if (translatedPixmap.isNull() || state->getFaceDown() || shouldPaintNameOverPicture()) {
painter->save();
transformPainter(painter, translatedSize, angle);
painter->setPen(Qt::white);