mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-11-09 11:33:25 -08:00
e81ee02c24
* [Icons] Keep semantic red and green on themed glyphs The one-glyph cutover recolored every icon from a single palette role, so a disabled deck, a not-ready player and a remove button all lost the red or green that carried their meaning. Add Positive and Negative application colors beside the accents, ship scheme-appropriate defaults for every theme, and resolve them through ThemeManager. Icons now take an IconTint: a palette role for structural glyphs, or a semantic role for states and add/remove actions. A disabled semantic icon falls back to the disabled foreground; on a selected row a semantic tint keeps its color only while it stays legible on the highlight, and a palette tint keeps the existing WindowText -> HighlightedText swap. * [Icons] Render a semantic-tint sheet for every shipped theme The PR showed two sheets for one theme, which cannot show that the shipped reds and greens stay legible on every palette. Each shipped theme and scheme now gets its own sheet: both families, three glyphs, at 16 and 24 px, on the window and button surfaces the contrast is measured against, with the disabled tone beside each family. The generator lives in its own test file so the preview work does not have to move the branches above it. * [Icons] Add a badge icon treatment Restore the filled-disc look the ready/not-ready icons had before the one-glyph cutover, without bringing back palette-locked art. IconStyle::Badge composes the existing sentinel SVG at paint time: a gradient disc, a dark ring, and the glyph re-weighted and inked for contrast against the tone. Line stays the default and is unchanged. Only the two state icons opt in. The add/remove icons keep the line treatment because their old art was a filled glyph with an outline and no disc, so badging them would invent a look the UI never had. Disabled badges fall back to the line glyph so an unavailable control still reads as unavailable. * [Icons] Add a sticker icon treatment The pre-#7595 add, remove and delete icons were filled shapes with a black outline and no disc. A tint cannot bring that back, and the badge disc is a different icon language, so add a third value to the existing style axis. IconStyle::Sticker draws the sentinel glyph twice: a near-black rim at the band width plus one rim on each side, then the tone pass clipped to the glyph and filled with a vertical gradient. Both treatments keep the disabled fallback to the line glyph. The fill rule moves into theme_icon_fill: the semantic tones are tuned for text, so a filled shape gives its tone a saturation floor, and a dark-scheme tone is pulled down rather than up. IconTint::resolve() applies the same floor to line glyphs, and the badge disc uses the same fill, so a line, a badge and a sticker next to each other carry the same green or red instead of a pale line beside a saturated glyph. The badge's glyph ink follows the scheme: white on light-scheme tones, as in the pre-#7595 art, and the saturated tone darkened to an outline-dark ink on dark-scheme tones, where the shared saturated disc is light enough that white would sit near 2.7:1. The new test pins both cases so the glyph cannot silently flip. resolveSvgStrokeWidth() moves the stroke-width rewrite into libcockatrice_utility so the badge and the sticker share it; the badge's local copy is gone. The sticker is opted into at 17 call sites: increment, decrement and remove_row in the deck editor, settings pages, token dialog, server dialogs and replay/deck storage tabs. The visual database's clear-filter button keeps its trash can (icons/delete) in the line treatment: that glyph is new in #7595, but it is the clearer metaphor, and a sticker rim closes its lid gap at toolbar sizes. The preview generators also gain a semantic-tint sheet for #7775 and a line/badge/sticker family strip, so the three PR descriptions can show the same rendered colors. * [Icons] Render authored theme SVG art without the SVG image plugin `QPixmap("theme:file.svg")` needs Qt's SVG *image-format* plugin. Debian builds that as the separate `qt6-svg-plugins` package, which is only a Recommends of `qt6-svg-dev`, so a `--no-install-recommends` install (CI, minimal user installs) does not have it. Authored theme art then loaded as a null pixmap: the two authored-art render tests failed on Debian 13 and on the Ubuntu sanitize leg while passing on a developer machine whose Qt bundles the format. Render authored SVG assets through QSvgRenderer instead, which is already linked for the sentinel path and needs no plugin. Raster assets keep the QPixmap loader. The test suite now hides the plugin directories, so the dependency cannot come back unnoticed on platforms that ship the plugin. * [Icons] Render a badge/sticker sheet for every shipped theme The PR showed one theme's badge and sticker sheets, which cannot show that the filled treatments read on every palette. Each shipped theme and scheme now gets its own sheet: both semantic families, three glyphs, as line glyphs, stickers and badges, at 16 and 24 px, on the window and button surfaces the contrast is measured against, with the disabled fallback under each family. The generator lives in its own test file so the preview work does not have to move the branches above it. * [Icons] Show the trash can with the sticker treatment again The sticker sheet kept the delete glyph out of the sticker rows and explained why: at toolbar sizes the rim closed the lid gap. The icon is used with the sticker treatment again for destructive actions, so the sheet now shows it and the exception note is gone. * [Icons] Apply the CI clang-format output to the treatment preview clang-format 18 wraps the family label and the glyph x offset differently from the local clang-format 23. The preview test takes the CI output so the bottom of the stack passes the style job on its own. * [Icons] Rewrite the icon role docs in plain language Address review: drop the AI-cadence prose from the IconStyle/IconTint and treatment headers, use ///< for the enum member docs, and move theme_icon.cpp's anonymous namespace above the IconTint definitions. No behavior change. * Address review findings --------- Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
119 lines
3.5 KiB
C++
119 lines
3.5 KiB
C++
#include "libcockatrice/utility/svg_recolor.h"
|
|
|
|
#include <QByteArray>
|
|
#include <gtest/gtest.h>
|
|
|
|
namespace
|
|
{
|
|
|
|
TEST(SvgRecolor, ReplacesEverySentinel)
|
|
{
|
|
const QByteArray svg = R"(<svg><path fill="currentColor"/><path stroke="currentColor"/></svg>)";
|
|
const QByteArray result = resolveSvgColorSentinel(svg, "#ff8800");
|
|
|
|
EXPECT_EQ(result.count("#ff8800"), 2);
|
|
EXPECT_FALSE(result.contains("currentColor"));
|
|
}
|
|
|
|
TEST(SvgRecolor, ReplacesSentinelRegardlessOfCase)
|
|
{
|
|
const QByteArray svg = R"(<svg><path fill="CurrentColor"/><path stroke="CURRENTCOLOR"/></svg>)";
|
|
|
|
EXPECT_EQ(resolveSvgColorSentinel(svg, "#ff8800").count("#ff8800"), 2);
|
|
}
|
|
|
|
TEST(SvgRecolor, LeavesTheRestOfTheDocumentIntact)
|
|
{
|
|
const QByteArray svg =
|
|
R"(<svg viewBox="0 0 24 24"><!-- an ordinary comment --><path d="M0 0h24v24" fill="currentColor"/></svg>)";
|
|
const QByteArray result = resolveSvgColorSentinel(svg, "#123456");
|
|
|
|
EXPECT_TRUE(result.contains(R"(viewBox="0 0 24 24")"));
|
|
EXPECT_TRUE(result.contains(R"(d="M0 0h24v24")"));
|
|
EXPECT_TRUE(result.contains("an ordinary comment"));
|
|
}
|
|
|
|
TEST(SvgRecolor, DoesNotModifyTheInput)
|
|
{
|
|
const QByteArray svg = R"(<svg><path fill="currentColor"/></svg>)";
|
|
const QByteArray original = svg;
|
|
|
|
resolveSvgColorSentinel(svg, "#000000");
|
|
|
|
EXPECT_EQ(svg, original);
|
|
}
|
|
|
|
TEST(SvgRecolor, PreservesBytesThatAreNotValidUtf8)
|
|
{
|
|
QByteArray svg = "<svg>";
|
|
svg.append("\xff\xfe");
|
|
svg.append(R"(<path fill="currentColor"/></svg>)");
|
|
|
|
const QByteArray result = resolveSvgColorSentinel(svg, "#ff8800");
|
|
|
|
EXPECT_TRUE(result.contains("\xff\xfe"));
|
|
EXPECT_FALSE(result.contains("currentColor"));
|
|
EXPECT_EQ(result.count("#ff8800"), 1);
|
|
}
|
|
|
|
TEST(SvgRecolor, NoSentinelIsANoOp)
|
|
{
|
|
const QByteArray svg = R"(<svg><path fill="#abcdef"/></svg>)";
|
|
|
|
EXPECT_EQ(resolveSvgColorSentinel(svg, "#ffffff"), svg);
|
|
}
|
|
|
|
TEST(SvgStrokeWidth, RewritesEveryAttribute)
|
|
{
|
|
const QByteArray svg = R"(<svg stroke-width="2"><path stroke-width="1.5"/><path stroke-width='3'/></svg>)";
|
|
|
|
const QByteArray result = resolveSvgStrokeWidth(svg, 4.25);
|
|
|
|
EXPECT_EQ(result.count(R"(stroke-width="4.25")"), 2);
|
|
EXPECT_EQ(result.count(R"(stroke-width='4.25')"), 1);
|
|
EXPECT_FALSE(result.contains("1.5"));
|
|
EXPECT_FALSE(result.contains("3'/"));
|
|
}
|
|
|
|
TEST(SvgStrokeWidth, LeavesCssDeclarationsAlone)
|
|
{
|
|
const QByteArray svg = R"(<svg><path style="stroke-width:2"/><path stroke-width="2"/></svg>)";
|
|
|
|
const QByteArray result = resolveSvgStrokeWidth(svg, 3.0);
|
|
|
|
EXPECT_TRUE(result.contains(R"(style="stroke-width:2")"));
|
|
EXPECT_EQ(result.count(R"(stroke-width="3.00")"), 1);
|
|
}
|
|
|
|
TEST(SvgStrokeWidth, NoAttributeIsANoOp)
|
|
{
|
|
const QByteArray svg = R"(<svg stroke-linecap="round"><path d="M0 0h24"/></svg>)";
|
|
|
|
EXPECT_EQ(resolveSvgStrokeWidth(svg, 3.0), svg);
|
|
}
|
|
|
|
TEST(SvgStrokeWidth, DoesNotModifyTheInputAndPreservesBytes)
|
|
{
|
|
QByteArray svg = "<svg>";
|
|
svg.append("\xff\xfe");
|
|
svg.append(R"(<path stroke-width="2"/></svg>)");
|
|
const QByteArray original = svg;
|
|
|
|
const QByteArray result = resolveSvgStrokeWidth(svg, 3.5);
|
|
|
|
EXPECT_EQ(svg, original);
|
|
EXPECT_TRUE(result.contains("\xff\xfe"));
|
|
EXPECT_TRUE(result.contains(R"(stroke-width="3.50")"));
|
|
}
|
|
|
|
TEST(SvgStrokeWidth, TruncatedAttributeTerminates)
|
|
{
|
|
// A quote that is never closed must not over-read or hang.
|
|
const QByteArray svg = R"(<svg><path stroke-width="2/></svg>)";
|
|
|
|
const QByteArray result = resolveSvgStrokeWidth(svg, 3.0);
|
|
|
|
EXPECT_TRUE(result.startsWith("<svg>"));
|
|
}
|
|
|
|
} // namespace
|