mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-11-08 19:13:25 -08:00
* [Settings] Add hover zoom/panel triggers, delays, and double-confirm * [Game] Smooth board hover-zoom with fade helpers * [Game] Add hover card panel with tabbed actions * [Game] Wire hover zoom/panel triggers through the scene * [Game] Repaint cached zones when the hover zoom moves `TableZone` cuts the hovered card out of its own paint so zone washes, indicators, dimming and the land divider never draw over the zoom. It is a `DeviceCoordinateCache` item, so the card changing geometry never dirtied it and the stale hole stayed transparent, uncovering the black viewport as soon as the zoom crossed a zone edge. - Emit `hoverFootprintChanged(old, new)` from `setCardScale()` and once from `setHovered(false)`. - Repaint every overlapping `TableZone` on that signal. - Clip with the card's painted outline instead of its bounding rectangle, and treat a zoom covering the whole zone as "paint nothing". * [Interface] Keep the hover panel P/T controls out of the way The P/T set/inc/dec rows were always visible and sat under the cursor, so clicking a card to select it could mutate its P/T instead. - Collapse the controls to a pill on the printed P/T box, anchored on the drawn artwork so letterboxed and sideways cards stay aligned. - Open the rows only from the pill and grow them upward, and re-measure the pill on every value so three-digit P/T does not clip. - Close the panel when another card is hovered, and repaint the area it covered so no patch is left behind. * [Interface] Address hover panel review findings * [Game] Fix include order flagged by the format gate The card hover widget header was included before theme_manager.h, which clang-format rejects; the branch's format CI job failed on it. * [Interface] Load the hover panel icons through the themed icon engine The panel still named pre-#7595 assets (arrow_*_green, arrow_right_blue, cogwheel) and built QIcon snapshots from themePixmap(), so the deleted names rendered blank and every other glyph froze one palette. Load every glyph through loadThemedIcon() with the emphasis axis the adoption plan calls for: the category tabs take the primary level as panel wayfinding, the action grid the quiet level because its glyphs label the button text. Semantic tints keep their family and follow the same quiet level; Clone keeps its sticker treatment. * [Icons] Add an Informational semantic color family Face-down play and the exile zone are states that are neither a gain nor a loss, and the pre-#7595 art painted them blue (arrow_right_blue). #7595 dropped that hue, and the icon engine has had only Positive and Negative since, so both states fall back to neutral ink. Add the family with the same three-level ladder the other semantic roles use: authored roles per theme, scheme defaults otherwise, an emphasis mapping, the palette-editor rows and the generator seed. The defaults clear the 4.5:1 label floor on both schemes and the ladder's saturation ordering; the existing emphasis, hue and preview tests now cover the new family. Preview sheets that name roles resolve an unauthored one through the same default the client paints. * [Interface] Split the hover panel icons by emphasis and semantics Category tabs only navigate between pages, so they take the quiet level; the action grid is the surface the player works in and takes the primary level. Both stay line glyphs: a filled treatment reads as a second state on every cell. Hue marks an outcome where the glyph cannot. Play, clone and to hand are Positive; reduce life and graveyard Negative; play face down and exile Informational. Direction-only moves (top and bottom of library) stay neutral because the arrow already carries the meaning. * [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. * [Icons] Add a Movement semantic color family A card changing position inside the library is neither a gain, a loss nor information, so it had no hue. Movement names it with teal and covers the three library placements (top, bottom, X from top). It follows the existing 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, keep strong > base > soft saturation, and keep green > blue > red so teal cannot be mistaken for the green gain family. * [Interface] Give every hover panel action a semantic color The quick actions are the panel's whole point, so a neutral glyph made the most-used buttons the hardest to scan. Every action now names a game fact with its hue: gain, loss, information, hidden information, a mark on the card or a move. The line glyph stays identical, so the colour is the only difference between neighbours. The grid is also ordered by family so a row reads as one idea: the two state toggles, the two gains, the two marks, the two hidden-information actions and the two losses each share a row. Conditional actions (Peek, Unattach) sit at the end of their pair, so a missing one leaves a hole at the section edge instead of splitting a row. In a zone, Play and Play Face Down stay adjacent on purpose: the same action, one of them hiding information. The move tab leads with the three library placements (Movement), then the destinations. actionGridIcon is removed; semanticActionIcon is now the only grid ink. The preview renders the real pages so the whole map can be judged at once. * [Icons] Use quiet emphasis for glyphs that label rather than act The search and info glyphs inside the search fields, and the combo-box chevron, label or afford an action rather than performing one. At the default secondary weight they compete with the actual controls next to them. Paint them at quiet emphasis so they stay legible without claiming attention. Sites: deck editor, visual database display, visual deck storage, set manager, settings search, in-game zone view, and the dropdown chevron. * [Icons] Restore sticker treatment to the add, remove and delete actions The pre-#7595 add and delete glyphs were filled shapes with an outline. After the line migration they read as ordinary toolbar glyphs, losing the weight their verbs had. Give the add and delete family the sticker treatment again. - Deck editor Add card: primary positive sticker. It is the one action the database panel exists for. - Visual database Clear filters: negative sticker, matching the delete family. - Filter dock Clear all: negative sticker, matching Clear one. * [Icons] Give sharing and pinning their semantic families Sharing is an informational act: the app already tints reveal and make-public with the informational family, so the deck storage share action, the replay share-code action and the visual deck storage share button follow it. The printing-selector pin badge marks a card as pinned. Paint it with the marked family, the same one used for a mark left on a card, instead of leaving it neutral. * [Game] Dismiss the hover panel before opening a modal dialog The hover panel is a Qt::ToolTip window, i.e. a popup: it is always on top and holds the input grab. Actions on the panel that open a modal dialog (Set power/toughness, Set annotation, Set counter value, token creation) therefore opened the dialog behind the panel, where it could not be seen or activated. Hide the panel synchronously and defer the action to the next event-loop turn, so the popup grab is released before the dialog's event loop starts. The panel asks the scene to dismiss it through a new dismissRequested signal, keeping hover timers and the covered-card fade on the scene's side. Reported from the P/T overlay SET button; the same path covers the counter tab and the token tab. * [Icons] Refine VDE and VDD emphasis and semantics The visual database filter section and the syntax help are information aids, so paint them with the informational family at the default emphasis: the filter section glyph and the search field's help glyph. The help glyph leaves quiet emphasis because it is a clickable action, not a field label. The visual deck editor's display-type toggle is the one control that changes the whole view, so it takes primary emphasis. The search glyphs stay quiet; only the help action changes. * [Icons] Raise the visual database filter controls to primary The six quick-filter buttons are the controls the filter section exists for, so paint them at primary emphasis instead of the default weight. The sort glyph carries the same informational family as the filter glyph, in both the visual database toolbar label and the visual deck editor's sort-criteria button. * [Icons] Keep the display options sort glyph neutral The sort button beside the display-mode toggle is not part of the informational family. Only the visual database toolbar's sort glyph carries informational; the display options button returns to the default neutral weight. --------- Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
233 lines
10 KiB
C++
233 lines
10 KiB
C++
#include "interface/theme_config.h"
|
|
#include "libcockatrice/utility/svg_recolor.h"
|
|
|
|
#include <QApplication>
|
|
#include <QByteArray>
|
|
#include <QColor>
|
|
#include <QDir>
|
|
#include <QFile>
|
|
#include <QFont>
|
|
#include <QGuiApplication>
|
|
#include <QImage>
|
|
#include <QPainter>
|
|
#include <QPalette>
|
|
#include <QPixmap>
|
|
#include <QPointF>
|
|
#include <QSize>
|
|
#include <QStringList>
|
|
#include <QStringLiteral>
|
|
#include <QSvgRenderer>
|
|
#include <gtest/gtest.h>
|
|
#include <iterator>
|
|
|
|
namespace
|
|
{
|
|
/**
|
|
* @brief Creates the GUI application QPixmap needs, using the offscreen plugin.
|
|
*
|
|
* The theme-migration binary is headless; creating this lazily keeps the other
|
|
* test files free of a display dependency.
|
|
*/
|
|
void ensureGuiApplication()
|
|
{
|
|
static int argc = 1;
|
|
static char name[] = "icon_tint_preview_test";
|
|
static char *argv[] = {name, nullptr};
|
|
// Leaked on purpose: a function-local static QApplication is destroyed before Qt's
|
|
// own library statics at exit, and the network module's destructors then run
|
|
// against a torn-down QObject layer (SEGV under AddressSanitizer).
|
|
static QApplication *app = new QApplication(argc, argv);
|
|
Q_UNUSED(app);
|
|
}
|
|
|
|
QString resourcesDir()
|
|
{
|
|
return QDir(QStringLiteral(COCKATRICE_SOURCE_DIR)).absoluteFilePath(QStringLiteral("cockatrice/resources"));
|
|
}
|
|
|
|
/** @brief Reads an authored icon from the theme resource directory. */
|
|
QByteArray readIconSvg(const char *name)
|
|
{
|
|
QFile file(QDir(resourcesDir()).absoluteFilePath(QStringLiteral("icons/%1.svg").arg(QString::fromLatin1(name))));
|
|
if (!file.open(QFile::ReadOnly)) {
|
|
return {};
|
|
}
|
|
return file.readAll();
|
|
}
|
|
|
|
/** @brief Renders a pixmap at device size and tags it with the ratio. */
|
|
template <typename Render> QPixmap renderAtDpr(const QSize &logicalSize, qreal dpr, Render &&render)
|
|
{
|
|
QPixmap pixmap = render(logicalSize * dpr);
|
|
pixmap.setDevicePixelRatio(dpr);
|
|
return pixmap;
|
|
}
|
|
} // namespace
|
|
|
|
/**
|
|
* @brief Writes one semantic-tint sheet per shipped palette theme.
|
|
*
|
|
* The theme files are the only place the shipped tones live, so each sheet is
|
|
* rendered from the palette the theme actually ships: all three semantic
|
|
* families, three glyphs each, at the two sizes the UI uses, on the window and
|
|
* button surfaces the contrast is measured against. A disabled row closes each
|
|
* family so the enabled/disabled order is visible next to the tone that carries
|
|
* it. A theme that does not author Informational falls back to the scheme
|
|
* default, which is what the client paints.
|
|
*/
|
|
TEST(IconTintPreview, WritesOneSheetPerShippedTheme)
|
|
{
|
|
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 LABEL_WIDTH = 190;
|
|
constexpr int SLOT = 36;
|
|
constexpr int ROW_HEIGHT = 56;
|
|
constexpr int PANEL_TITLE = 26;
|
|
constexpr int PANEL_PADDING = 12;
|
|
constexpr qreal DPR = 2.0;
|
|
constexpr int SIZES[] = {16, 24};
|
|
|
|
struct Family
|
|
{
|
|
const char *name;
|
|
AppColor::Role role;
|
|
const char *glyphs[3];
|
|
};
|
|
const QList<Family> families = {
|
|
{"Positive", AppColor::Positive, {"increment", "ready_start", "arrow_up"}},
|
|
{"Negative", AppColor::Negative, {"decrement", "not_ready_start", "remove_row"}},
|
|
{"Informational", AppColor::Informational, {"arrow_right", "view", "arrow_to_top"}},
|
|
{"Hidden", AppColor::Hidden, {"view", "arrow_right", "swap"}},
|
|
{"Marked", AppColor::Marked, {"pencil", "share", "pin"}},
|
|
{"Movement", AppColor::Movement, {"arrow_to_top", "arrow_to_bottom", "arrow_down"}},
|
|
};
|
|
const QStringList themes = {
|
|
QStringLiteral("Fabric"), QStringLiteral("Fusion"), QStringLiteral("Leather"),
|
|
QStringLiteral("Plasma"), QStringLiteral("VelvetMarble"),
|
|
};
|
|
|
|
const auto renderLine = [](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;
|
|
};
|
|
|
|
const int glyphCount = static_cast<int>(std::size(families.first().glyphs));
|
|
const int columnCount = glyphCount * static_cast<int>(std::size(SIZES));
|
|
const int panelWidth = LABEL_WIDTH + columnCount * SLOT + PANEL_PADDING;
|
|
const int panelHeight = PANEL_TITLE + static_cast<int>(families.size()) * 2 * ROW_HEIGHT + PANEL_PADDING;
|
|
const int logicalWidth = 2 * MARGIN + panelWidth;
|
|
const int logicalHeight = MARGIN + 30 + 2 * (panelHeight + 24) + MARGIN;
|
|
|
|
for (const QString &theme : themes) {
|
|
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 button = palette.color(QPalette::Active, QPalette::Button);
|
|
const QColor text = palette.color(QPalette::Active, QPalette::WindowText);
|
|
const QColor disabled = palette.color(QPalette::Disabled, QPalette::WindowText);
|
|
|
|
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, semantic tints")
|
|
.arg(theme, dark ? QStringLiteral("dark") : QStringLiteral("light")));
|
|
|
|
struct Surface
|
|
{
|
|
const char *name;
|
|
QColor background;
|
|
};
|
|
const QList<Surface> surfaces = {
|
|
{"Window surface", window},
|
|
{"Button surface", button},
|
|
};
|
|
|
|
qreal panelTop = MARGIN + 30;
|
|
for (const Surface &surface : surfaces) {
|
|
painter.setPen(Qt::NoPen);
|
|
painter.setBrush(surface.background);
|
|
painter.drawRoundedRect(QRectF(MARGIN, panelTop, panelWidth, panelHeight), 8, 8);
|
|
|
|
const qreal contentLeft = MARGIN + PANEL_PADDING;
|
|
painter.setPen(text);
|
|
painter.setFont(QFont(QStringLiteral("Sans"), 9, QFont::DemiBold));
|
|
painter.drawText(QPointF(contentLeft, panelTop + 18), QString::fromLatin1(surface.name));
|
|
|
|
painter.setFont(QFont(QStringLiteral("Sans"), 8));
|
|
for (std::size_t sizeIndex = 0; sizeIndex < std::size(SIZES); ++sizeIndex) {
|
|
const qreal x = contentLeft + LABEL_WIDTH + static_cast<qreal>(sizeIndex) * glyphCount * SLOT;
|
|
painter.drawText(QPointF(x, panelTop + PANEL_TITLE + 14),
|
|
QStringLiteral("%1 px").arg(SIZES[sizeIndex]));
|
|
}
|
|
|
|
qreal y = panelTop + PANEL_TITLE + 20;
|
|
for (const Family &family : families) {
|
|
const QColor tone = config.appColors.value(family.role, defaultAppColor(family.role, dark));
|
|
ASSERT_TRUE(tone.isValid()) << theme.toStdString() << " " << family.name;
|
|
for (int state = 0; state < 2; ++state) {
|
|
const bool isDisabled = state == 1;
|
|
const QColor ink = isDisabled ? disabled : tone;
|
|
|
|
painter.setPen(text);
|
|
painter.setFont(QFont(QStringLiteral("Sans"), 8, QFont::DemiBold));
|
|
painter.drawText(
|
|
QPointF(contentLeft, y + 14),
|
|
QStringLiteral("%1%2").arg(QString::fromLatin1(family.name),
|
|
isDisabled ? QStringLiteral(" / disabled") : QString()));
|
|
painter.setFont(QFont(QStringLiteral("Mono"), 7));
|
|
painter.drawText(QPointF(contentLeft, y + 28), ink.name(QColor::HexRgb));
|
|
|
|
for (std::size_t sizeIndex = 0; sizeIndex < std::size(SIZES); ++sizeIndex) {
|
|
const int side = SIZES[sizeIndex];
|
|
const QSize size(side, side);
|
|
for (int glyphIndex = 0; glyphIndex < glyphCount; ++glyphIndex) {
|
|
const QByteArray svg = readIconSvg(family.glyphs[glyphIndex]);
|
|
ASSERT_FALSE(svg.isEmpty()) << family.glyphs[glyphIndex];
|
|
const QPixmap pixmap = renderAtDpr(
|
|
size, DPR, [&](const QSize &pixelSize) { return renderLine(svg, ink, pixelSize); });
|
|
const qreal x = contentLeft + LABEL_WIDTH +
|
|
static_cast<qreal>(sizeIndex * glyphCount + glyphIndex) * SLOT +
|
|
(SLOT - side) / 2.0;
|
|
painter.drawPixmap(QPointF(x, y + (ROW_HEIGHT - side) / 2.0 - 2), pixmap);
|
|
}
|
|
}
|
|
y += ROW_HEIGHT;
|
|
}
|
|
}
|
|
panelTop += panelHeight + 24;
|
|
}
|
|
|
|
painter.end();
|
|
const QString path = QDir(outDir).absoluteFilePath(
|
|
QStringLiteral("semantic-tint-preview-%1-%2.png")
|
|
.arg(theme.toLower(), dark ? QStringLiteral("dark") : QStringLiteral("light")));
|
|
ASSERT_TRUE(image.save(path)) << path.toStdString();
|
|
}
|
|
}
|
|
}
|