mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-11-10 20:13:24 -08:00
[Icons] Add Hidden and Marked semantic color families
Two game concepts had no hue of their own. Hidden information (a face-down play, peeking at a card face) now has violet, and the marks a player leaves on a card (annotation, draw arrow) now share amber instead of splitting blue and red for the same job. Both families follow the existing three-level ladder: authored roles per theme, scheme defaults otherwise, an emphasis mapping, palette-editor rows and generator seeding. The defaults clear the 4.5:1 floor on the representative platform surfaces and keep the saturation ordering the emphasis tests assert; the hue tests pin violet's blue-red-green dominance and amber's red-green-blue one, and every preview sheet now renders the two families. The hover panel grid preview is added alongside: it renders the real pages (section headers, two-column cells, glyph over label) so the whole map can be judged at once instead of glyph by glyph.
This commit is contained in:
Lukas Brübach
parent
cc9c93eb57
commit
8847da74e2
10 changed files with 411 additions and 9 deletions
|
|
@ -10,6 +10,7 @@
|
|||
#include <QDir>
|
||||
#include <QFile>
|
||||
#include <QFont>
|
||||
#include <QFontMetrics>
|
||||
#include <QGuiApplication>
|
||||
#include <QImage>
|
||||
#include <QPainter>
|
||||
|
|
@ -110,6 +111,8 @@ TEST(IconTreatmentPreview, WritesOneSheetPerShippedTheme)
|
|||
{"Positive", AppColor::Positive, {"arrow_right", "increment", "arrow_left"}},
|
||||
{"Negative", AppColor::Negative, {"arrow_down", "decrement", "remove_row"}},
|
||||
{"Informational", AppColor::Informational, {"arrow_right", "view", "arrow_to_top"}},
|
||||
{"Hidden", AppColor::Hidden, {"view", "arrow_right", "swap"}},
|
||||
{"Marked", AppColor::Marked, {"pencil", "share", "pin"}},
|
||||
};
|
||||
const QStringList themes = {
|
||||
QStringLiteral("Fabric"), QStringLiteral("Fusion"), QStringLiteral("Leather"),
|
||||
|
|
@ -251,3 +254,312 @@ TEST(IconTreatmentPreview, WritesOneSheetPerShippedTheme)
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
namespace
|
||||
{
|
||||
/** @brief One action-grid cell, with the role the panel hands the icon engine. */
|
||||
struct PreviewAction
|
||||
{
|
||||
QString label;
|
||||
const char *glyph;
|
||||
AppColor::Role role;
|
||||
};
|
||||
|
||||
/** @brief One titled section of a hover panel page. */
|
||||
struct PreviewSection
|
||||
{
|
||||
QString title;
|
||||
QList<PreviewAction> actions;
|
||||
};
|
||||
|
||||
/** @brief One hover panel page, as the client builds it. */
|
||||
struct PreviewPage
|
||||
{
|
||||
QString title;
|
||||
QList<PreviewSection> sections;
|
||||
};
|
||||
|
||||
/** @brief Renders a sentinel SVG in one ink at the requested pixel size. */
|
||||
QPixmap renderInkGlyph(const QByteArray &svg, const QColor &ink, const QSize &size)
|
||||
{
|
||||
QSvgRenderer renderer(resolveSvgColorSentinel(svg, ink.name(QColor::HexRgb).toLatin1()));
|
||||
QPixmap pixmap(size);
|
||||
pixmap.fill(Qt::transparent);
|
||||
QPainter painter(&pixmap);
|
||||
painter.setRenderHint(QPainter::Antialiasing, true);
|
||||
renderer.render(&painter);
|
||||
return pixmap;
|
||||
}
|
||||
} // namespace
|
||||
|
||||
/**
|
||||
* @brief Writes the hover panel's action grids the way the client paints them.
|
||||
*
|
||||
* The treatment sheets show glyphs in isolation; this renders the real layout —
|
||||
* section headers and two-column cells with the glyph above its label — so the
|
||||
* emphasis split (quiet tabs, primary grid) and the semantic map can be judged
|
||||
* as the set the player actually sees. The roles are the ones the panel passes
|
||||
* to the icon engine, already resolved to the emphasis level it requests, and a
|
||||
* role the theme does not author resolves through the same scheme default the
|
||||
* client paints.
|
||||
*/
|
||||
TEST(IconTreatmentPreview, HoverPanelGridWritesPngsWhenRequested)
|
||||
{
|
||||
const QString outDir = qEnvironmentVariable("COCKATRICE_ICON_PREVIEW_DIR");
|
||||
if (outDir.isEmpty()) {
|
||||
GTEST_SKIP() << "set COCKATRICE_ICON_PREVIEW_DIR to write the preview PNGs";
|
||||
}
|
||||
ensureGuiApplication();
|
||||
ASSERT_TRUE(QDir().mkpath(outDir));
|
||||
|
||||
constexpr int MARGIN = 24;
|
||||
constexpr int COLUMNS = 2;
|
||||
constexpr int CELL_WIDTH = 146;
|
||||
constexpr int CELL_HEIGHT = 62;
|
||||
constexpr int SECTION_HEIGHT = 22;
|
||||
constexpr int PANEL_PADDING = 10;
|
||||
constexpr int PANEL_TITLE = 24;
|
||||
constexpr int GLYPH = 22;
|
||||
constexpr qreal DPR = 2.0;
|
||||
|
||||
// The two pages a selected card shows, with every conditional action
|
||||
// present so the whole map is visible at once.
|
||||
const QList<PreviewPage> pages = {
|
||||
PreviewPage{.title = QStringLiteral("Main — on the battlefield"),
|
||||
.sections =
|
||||
{
|
||||
PreviewSection{.title = QStringLiteral("Battlefield"),
|
||||
.actions =
|
||||
{
|
||||
PreviewAction{.label = QStringLiteral("Tap / Untap"),
|
||||
.glyph = "sync",
|
||||
.role = AppColor::IconStrong},
|
||||
PreviewAction{.label = QStringLiteral("Skip untapping"),
|
||||
.glyph = "lock",
|
||||
.role = AppColor::IconStrong},
|
||||
PreviewAction{.label = QStringLiteral("Turn Over"),
|
||||
.glyph = "swap",
|
||||
.role = AppColor::IconStrong},
|
||||
PreviewAction{.label = QStringLiteral("Peek at card face"),
|
||||
.glyph = "view",
|
||||
.role = AppColor::HiddenStrong},
|
||||
PreviewAction{.label = QStringLiteral("Clone"),
|
||||
.glyph = "increment",
|
||||
.role = AppColor::PositiveStrong},
|
||||
PreviewAction{.label = QStringLiteral("Attach to card..."),
|
||||
.glyph = "pin",
|
||||
.role = AppColor::IconStrong},
|
||||
PreviewAction{.label = QStringLiteral("Unattach"),
|
||||
.glyph = "arrow_undo",
|
||||
.role = AppColor::NegativeStrong},
|
||||
PreviewAction{.label = QStringLiteral("Draw arrow..."),
|
||||
.glyph = "share",
|
||||
.role = AppColor::MarkedStrong},
|
||||
PreviewAction{.label = QStringLiteral("Set annotation..."),
|
||||
.glyph = "pencil",
|
||||
.role = AppColor::MarkedStrong},
|
||||
PreviewAction{.label = QStringLiteral("Reduce life"),
|
||||
.glyph = "arrow_down",
|
||||
.role = AppColor::NegativeStrong},
|
||||
}},
|
||||
PreviewSection{.title = QStringLiteral("Select"),
|
||||
.actions =
|
||||
{
|
||||
PreviewAction{.label = QStringLiteral("Select All"),
|
||||
.glyph = "search",
|
||||
.role = AppColor::IconStrong},
|
||||
PreviewAction{.label = QStringLiteral("Select Row"),
|
||||
.glyph = "filter",
|
||||
.role = AppColor::IconStrong},
|
||||
}},
|
||||
}},
|
||||
PreviewPage{.title = QStringLiteral("Main — in a zone"),
|
||||
.sections =
|
||||
{
|
||||
PreviewSection{.title = QStringLiteral("Zone"),
|
||||
.actions =
|
||||
{
|
||||
PreviewAction{.label = QStringLiteral("Play"),
|
||||
.glyph = "arrow_right",
|
||||
.role = AppColor::PositiveStrong},
|
||||
PreviewAction{.label = QStringLiteral("Play Face Down"),
|
||||
.glyph = "arrow_right",
|
||||
.role = AppColor::HiddenStrong},
|
||||
PreviewAction{.label = QStringLiteral("Clone"),
|
||||
.glyph = "increment",
|
||||
.role = AppColor::PositiveStrong},
|
||||
PreviewAction{.label = QStringLiteral("Attach to card..."),
|
||||
.glyph = "pin",
|
||||
.role = AppColor::IconStrong},
|
||||
PreviewAction{.label = QStringLiteral("Draw arrow..."),
|
||||
.glyph = "share",
|
||||
.role = AppColor::MarkedStrong},
|
||||
}},
|
||||
PreviewSection{.title = QStringLiteral("Select"),
|
||||
.actions =
|
||||
{
|
||||
PreviewAction{.label = QStringLiteral("Select All"),
|
||||
.glyph = "search",
|
||||
.role = AppColor::IconStrong},
|
||||
PreviewAction{.label = QStringLiteral("Select Column"),
|
||||
.glyph = "filter",
|
||||
.role = AppColor::IconStrong},
|
||||
}},
|
||||
}},
|
||||
PreviewPage{.title = QStringLiteral("Move — card in a zone"),
|
||||
.sections =
|
||||
{
|
||||
PreviewSection{.title = QStringLiteral("Move to"),
|
||||
.actions =
|
||||
{
|
||||
PreviewAction{.label = QStringLiteral("Top of library"),
|
||||
.glyph = "arrow_to_top",
|
||||
.role = AppColor::IconStrong},
|
||||
PreviewAction{.label = QStringLiteral("X from top..."),
|
||||
.glyph = "search",
|
||||
.role = AppColor::IconStrong},
|
||||
PreviewAction{.label = QStringLiteral("Bottom of library"),
|
||||
.glyph = "arrow_to_bottom",
|
||||
.role = AppColor::IconStrong},
|
||||
PreviewAction{.label = QStringLiteral("Table"),
|
||||
.glyph = "player",
|
||||
.role = AppColor::IconStrong},
|
||||
PreviewAction{.label = QStringLiteral("Hand"),
|
||||
.glyph = "arrow_left",
|
||||
.role = AppColor::PositiveStrong},
|
||||
PreviewAction{.label = QStringLiteral("Graveyard"),
|
||||
.glyph = "arrow_down",
|
||||
.role = AppColor::NegativeStrong},
|
||||
PreviewAction{.label = QStringLiteral("Exile"),
|
||||
.glyph = "arrow_right",
|
||||
.role = AppColor::InformationalStrong},
|
||||
}},
|
||||
PreviewSection{.title = QStringLiteral("Reveal to..."),
|
||||
.actions =
|
||||
{
|
||||
PreviewAction{.label = QStringLiteral("All players"),
|
||||
.glyph = "share",
|
||||
.role = AppColor::InformationalStrong},
|
||||
PreviewAction{.label = QStringLiteral("Alice"),
|
||||
.glyph = "player",
|
||||
.role = AppColor::InformationalStrong},
|
||||
PreviewAction{.label = QStringLiteral("Bob"),
|
||||
.glyph = "player",
|
||||
.role = AppColor::InformationalStrong},
|
||||
}},
|
||||
}},
|
||||
};
|
||||
|
||||
const auto rowsIn = [](const PreviewSection §ion) { return (section.actions.size() + COLUMNS - 1) / COLUMNS; };
|
||||
const auto panelHeightFor = [&](const PreviewPage &page) {
|
||||
int height = PANEL_TITLE + PANEL_PADDING;
|
||||
for (const PreviewSection §ion : page.sections) {
|
||||
height += SECTION_HEIGHT + rowsIn(section) * CELL_HEIGHT;
|
||||
}
|
||||
return height + PANEL_PADDING;
|
||||
};
|
||||
|
||||
const int panelWidth = COLUMNS * CELL_WIDTH + 2 * PANEL_PADDING;
|
||||
const int pageCount = static_cast<int>(pages.size());
|
||||
int tallestPanel = 0;
|
||||
for (const PreviewPage &page : pages) {
|
||||
tallestPanel = qMax(tallestPanel, panelHeightFor(page));
|
||||
}
|
||||
const int logicalWidth = 2 * MARGIN + pageCount * panelWidth + (pageCount - 1) * MARGIN;
|
||||
const int logicalHeight = MARGIN + 30 + tallestPanel + MARGIN;
|
||||
|
||||
const QString theme = QStringLiteral("Fabric");
|
||||
for (const bool dark : {false, true}) {
|
||||
const QString file =
|
||||
QDir(QStringLiteral(COCKATRICE_SOURCE_DIR))
|
||||
.absoluteFilePath(QStringLiteral("cockatrice/themes/%1/palette-default-%2.toml")
|
||||
.arg(theme, dark ? QStringLiteral("dark") : QStringLiteral("light")));
|
||||
const PaletteConfig config = PaletteConfig::fromFile(file);
|
||||
ASSERT_TRUE(config.hasPalette()) << theme.toStdString();
|
||||
|
||||
const QPalette palette = config.apply(QPalette());
|
||||
const QColor window = palette.color(QPalette::Active, QPalette::Window);
|
||||
const QColor text = palette.color(QPalette::Active, QPalette::WindowText);
|
||||
// The panel's cells sit on the popup surface; painting them on the
|
||||
// button color is what a QToolButton shows when it is not hovered.
|
||||
const QColor cell = palette.color(QPalette::Active, QPalette::Button);
|
||||
|
||||
QImage image(QSize(qRound(logicalWidth * DPR), qRound(logicalHeight * DPR)),
|
||||
QImage::Format_ARGB32_Premultiplied);
|
||||
image.fill(window);
|
||||
QPainter painter(&image);
|
||||
painter.setRenderHint(QPainter::Antialiasing, true);
|
||||
painter.setRenderHint(QPainter::SmoothPixmapTransform, true);
|
||||
painter.scale(DPR, DPR);
|
||||
|
||||
painter.setPen(text);
|
||||
painter.setFont(QFont(QStringLiteral("Sans"), 10, QFont::DemiBold));
|
||||
painter.drawText(QPointF(MARGIN, MARGIN),
|
||||
QStringLiteral("%1 — %2 scheme, hover panel action grids")
|
||||
.arg(theme, dark ? QStringLiteral("dark") : QStringLiteral("light")));
|
||||
|
||||
const auto toneFor = [&](AppColor::Role role) {
|
||||
return config.appColors.value(role, defaultAppColor(role, dark));
|
||||
};
|
||||
|
||||
for (int pageIndex = 0; pageIndex < pageCount; ++pageIndex) {
|
||||
const PreviewPage &page = pages[pageIndex];
|
||||
const qreal panelLeft = MARGIN + static_cast<qreal>(pageIndex) * (panelWidth + MARGIN);
|
||||
const qreal panelTop = MARGIN + 30;
|
||||
const int panelHeight = panelHeightFor(page);
|
||||
|
||||
painter.setPen(Qt::NoPen);
|
||||
painter.setBrush(cell.darker(dark ? 115 : 103));
|
||||
painter.drawRoundedRect(QRectF(panelLeft, panelTop, panelWidth, panelHeight), 8, 8);
|
||||
|
||||
painter.setPen(text);
|
||||
painter.setFont(QFont(QStringLiteral("Sans"), 9, QFont::DemiBold));
|
||||
painter.drawText(QPointF(panelLeft + PANEL_PADDING, panelTop + 17), page.title);
|
||||
|
||||
qreal y = panelTop + PANEL_TITLE;
|
||||
for (const PreviewSection §ion : page.sections) {
|
||||
painter.setPen(text);
|
||||
painter.setFont(QFont(QStringLiteral("Sans"), 8, QFont::DemiBold));
|
||||
painter.drawText(QPointF(panelLeft + PANEL_PADDING, y + 15), section.title);
|
||||
y += SECTION_HEIGHT;
|
||||
|
||||
const int rows = rowsIn(section);
|
||||
for (int row = 0; row < rows; ++row) {
|
||||
for (int column = 0; column < COLUMNS; ++column) {
|
||||
const int index = row * COLUMNS + column;
|
||||
if (index >= section.actions.size()) {
|
||||
break;
|
||||
}
|
||||
const PreviewAction &action = section.actions.at(index);
|
||||
const QRectF cellRect(panelLeft + PANEL_PADDING + column * CELL_WIDTH, y, CELL_WIDTH - 4,
|
||||
CELL_HEIGHT - 4);
|
||||
|
||||
painter.setPen(Qt::NoPen);
|
||||
painter.setBrush(cell);
|
||||
painter.drawRoundedRect(cellRect, 5, 5);
|
||||
|
||||
const QByteArray svg = readIconSvg(action.glyph);
|
||||
ASSERT_FALSE(svg.isEmpty()) << action.glyph;
|
||||
const QPixmap pixmap = renderAtDpr(QSize(GLYPH, GLYPH), DPR, [&](const QSize &pixelSize) {
|
||||
return renderInkGlyph(svg, toneFor(action.role), pixelSize);
|
||||
});
|
||||
painter.drawPixmap(QPointF(cellRect.center().x() - GLYPH / 2.0, cellRect.top() + 7), pixmap);
|
||||
|
||||
painter.setPen(text);
|
||||
painter.setFont(QFont(QStringLiteral("Sans"), 7));
|
||||
const QFontMetrics metrics(painter.font());
|
||||
const QString label = metrics.elidedText(action.label, Qt::ElideRight, CELL_WIDTH - 12);
|
||||
painter.drawText(QRectF(cellRect.left(), cellRect.bottom() - 20, cellRect.width(), 16),
|
||||
Qt::AlignHCenter | Qt::AlignVCenter, label);
|
||||
}
|
||||
y += CELL_HEIGHT;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
painter.end();
|
||||
const QString path = QDir(outDir).absoluteFilePath(
|
||||
QStringLiteral("hover-panel-map-%1.png").arg(dark ? QStringLiteral("dark") : QStringLiteral("light")));
|
||||
ASSERT_TRUE(image.save(path)) << path.toStdString();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue