jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-11-10 20:13:24 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

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

Browse source 
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.
This commit is contained in:
Lukas Brübach 2026-11-09 09:53:57 +01:00
parent e62c250152
commit 60941f5c70
4 changed files with 99 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

93
cockatrice/src/game_graphics/dialogs/token_preview_widget.cpp
View file

@ -1,11 +1,34 @@
#include "token_preview_widget.h"
#include "../../interface/theme_manager.h"
#include "../board/abstract_card_item.h"
#include <QColor>
#include <QFont>
#include <QFontMetricsF>
#include <QGraphicsScene>
#include <QPainter>
#include <QPointF>
#include <QResizeEvent>
#include <QString>
#include <algorithm>
#include <libcockatrice/card/card_info.h>
#include <libcockatrice/utility/card_ref.h>
namespace
{
// P/T pill, matching the #7700 hover panel. Its sizes are given for a 270 px picture
// (CardHoverWidget::CARD_IMAGE_WIDTH) and scale with the preview.
constexpr qreal PILL_REFERENCE_WIDTH = 270.0;
constexpr qreal PILL_MIN_WIDTH = 48.0;
constexpr qreal PILL_MIN_HEIGHT = 22.0;
constexpr qreal PILL_TEXT_PADDING = 4.0;
constexpr qreal PILL_CORNER_RADIUS = 4.0;
constexpr qreal PILL_FONT_PIXELS = 12.0;
constexpr qreal PILL_ANCHOR_X = 0.92;
constexpr qreal PILL_ANCHOR_Y = 0.94;
constexpr int PILL_SCRIM_ALPHA = 180;
} // namespace
class TokenPreviewCardItem : public AbstractCardItem
{
@ -26,19 +49,69 @@ public:
AbstractCardItem::paint(painter, option, widget);
const QSizeF translatedSize = getTranslatedSize(painter);
if (translatedSize.isEmpty()) {
return;
}
const qreal scale = translatedSize.width() / boundingRect().width();
painter->save();
transformPainter(painter, translatedSize, 0);
painter->setPen(Qt::white);
painter->setBackground(Qt::black);
painter->setBackgroundMode(Qt::OpaqueMode);
const QRectF textRect(4 * scale, 4 * scale, translatedSize.width() - 8 * scale,
translatedSize.height() - 8 * scale);
painter->drawText(textRect, Qt::AlignCenter | Qt::TextWrapAnywhere, state->getAnnotation());
if (state->getPT() != getCardInfo().getPowTough()) {
painter->setPen(QColor(255, 150, 0));
if (!state->getAnnotation().isEmpty()) {
painter->setPen(Qt::white);
painter->setBackground(Qt::black);
painter->setBackgroundMode(Qt::OpaqueMode);
const QRectF textRect(4 * scale, 4 * scale, translatedSize.width() - 8 * scale,
translatedSize.height() - 8 * scale);
painter->drawText(textRect, Qt::AlignCenter | Qt::TextWrapAnywhere, state->getAnnotation());
}
painter->drawText(textRect, Qt::AlignRight | Qt::AlignBottom, state->getPT());
// The card picture already shows the printed P/T, so only a different value
// needs the pill. A custom token with no picture also has no printed value.
const QString pt = state->getPT();
if (!pt.isEmpty() && pt != getCardInfo().getPowTough()) {
paintPtPill(painter, translatedSize, pt);
}
painter->restore();
}
protected:
// The artwork carries the name; the dialog's own fields already show it.
[[nodiscard]] bool shouldPaintNameOverPicture() const override
{
return false;
}
private:
void paintPtPill(QPainter *painter, const QSizeF &translatedSize, const QString &pt) const
{
const qreal ratio = translatedSize.width() / PILL_REFERENCE_WIDTH;
QFont font = themeManager->appFont(AppFont::CardText);
font.setBold(true);
font.setPixelSize(std::max(1, qRound(PILL_FONT_PIXELS * ratio)));
const QFontMetricsF metrics(font);
const QSizeF pillSize(
qMax(PILL_MIN_WIDTH * ratio, metrics.horizontalAdvance(pt) + 2 * PILL_TEXT_PADDING * ratio),
qMax(PILL_MIN_HEIGHT * ratio, metrics.height()));
const QPointF anchor(translatedSize.width() * PILL_ANCHOR_X, translatedSize.height() * PILL_ANCHOR_Y);
// Centred on the card's printed P/T box, then kept inside the card.
const QRectF pill(qBound(0.0, anchor.x() - pillSize.width() / 2, translatedSize.width() - pillSize.width()),
qBound(0.0, anchor.y() - pillSize.height() / 2, translatedSize.height() - pillSize.height()),
pillSize.width(), pillSize.height());
painter->save();
painter->setRenderHint(QPainter::Antialiasing, true);
painter->setBackgroundMode(Qt::TransparentMode);
painter->setPen(Qt::NoPen);
painter->setBrush(QColor(0, 0, 0, PILL_SCRIM_ALPHA));
const qreal radius = PILL_CORNER_RADIUS * ratio;
painter->drawRoundedRect(pill, radius, radius);
painter->setFont(font);
painter->setPen(Qt::white);
painter->drawText(pill, Qt::AlignCenter, pt);
painter->restore();
}
};
@ -61,7 +134,7 @@ TokenPreviewWidget::TokenPreviewWidget(QWidget *parent) : QGraphicsView(parent),
void TokenPreviewWidget::setToken(const TokenInfo &token)
{
card->setCardRef({token.name, token.providerId});
card->setCardRef(CardRef{.name = token.name, .providerId = token.providerId});
card->setColor(token.color);
card->setFaceDown(false);
card->getState()->setPT(token.pt);