mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-11-09 03:23:24 -08:00
c7e8422808
Some checks are pending
CodeQL / Analyze (cpp) (push) Waiting to run
CodeQL / Analyze (actions) (push) Waiting to run
Build Desktop / Configure (push) Waiting to run
Build Desktop / vcpkg baseline (push) Waiting to run
Build Desktop / Debian 13 (push) Blocked by required conditions
Build Desktop / Fedora 45 release (push) Blocked by required conditions
Build Desktop / Fedora 45 debug (push) Blocked by required conditions
Build Desktop / Servatrice_Debian 12 (push) Blocked by required conditions
Build Desktop / Ubuntu 26.04 (push) Blocked by required conditions
Build Desktop / Arch (push) Blocked by required conditions
Build Desktop / Debian 12 (push) Blocked by required conditions
Build Desktop / Fedora 44 (push) Blocked by required conditions
Build Desktop / Ubuntu 24.04 (push) Blocked by required conditions
Build Desktop / Ubuntu 26.04 sanitize (push) Blocked by required conditions
Build Desktop / Ubuntu 26.04 cover (push) Blocked by required conditions
Build Desktop / macOS 14 (push) Blocked by required conditions
Build Desktop / macOS 15 (push) Blocked by required conditions
Build Desktop / macOS 27 Debug (push) Blocked by required conditions
Build Desktop / Windows 10 (push) Blocked by required conditions
Build Desktop / macOS 13 Intel (push) Blocked by required conditions
Build Desktop / Prune caches (push) Waiting to run
Build Docker / Servatrice (arm) (push) Waiting to run
Build Docker / Servatrice (x86) (push) Waiting to run
Build Docker / Publish multi-platform Servatrice image (push) Blocked by required conditions
* [Icons] Author icon emphasis colors as palette roles The emphasis levels were computed from the accent at paint time, so a theme could not vary them: every theme got the same derived strong and soft tones, and a semantic hue was pushed toward the accent whether the author wanted that or not. Give each family three authored roles instead. Icon/IconStrong/IconSoft carry the neutral glyph ink and Positive/Negative gain the same Strong and Soft companions. Emphasis becomes a lookup inside the family, and a caller that names a variant pins that level at every emphasis. The paint path returns the authored color verbatim; only the filled treatments keep their saturation floor, because carrying a disc or a fill is a treatment decision. Shipped palettes author the full ladder for both schemes; the palette editor exposes the new rows and the generator writes them. System keeps deriving its neutral ink from the platform palette, since it ships no palette of its own. * [Icons] Keep the authored emphasis in filled treatments The saturation floor was added while the emphasis levels were still computed: it rescued the pale dark-scheme tones once a whole shape carried them. With the levels authored, the floor overrides the author instead: a quiet level jumped to the secondary saturation as soon as a sticker or a badge painted it, so the ladder only existed for line glyphs. The authored tone is now the top of the fill gradient and the treatment only darkens the bottom for depth, so every treatment renders exactly the level the palette stores. The badge glyph ink no longer guesses the scheme from the tone's value: an authored quiet level is a dark color on the dark scheme too, so the scheme is passed in from the surface palette. The preview sheet renders every shipped palette theme, three glyphs per family, and each row prints the authored tone and the darker bottom. * [Icons] Order the emphasis ladder by chroma, not contrast Contrast cannot order the ladder. On a dark surface the highest-contrast tone is the palest one, so a 7:1 primary came out near-white while the secondary kept the family's color; the ladder read inverted, and for the shipped semantic greens and reds the primary level was already satisfied by the secondary, so the two levels resolved to the same hex. Emphasis is chromatic intensity now. Quiet recedes toward the surface at the 3:1 non-text floor, secondary keeps the family color at the 4.5:1 text floor, and primary is the most chromatic tone the same floor allows. Every level stays legible on the window and the button surface, and the primary is a strictly more saturated member of its family on both schemes. The reformatted palettes move the two upper levels onto the shared floor and leave the quiet level alone. * [Icons] Make the emphasis ladder structural on every theme The chroma ladder landed with four P1s from review: reachContrast picked its pole by background lightness instead of by what each pole can reach, the generated neutral ink was solved on the window surface only, Fusion's neutral family was still the green accent, and quiet sat below the text floor while disabled reused the palette gray. Pick the pole by achievable contrast, solve fallback and preview inks on the harder of the window and button surfaces, re-author Fusion's neutral trio in slate blue, and keep quiet on the shared text floor by muting its saturation to 45% instead of blending it into the surface. Disabled is now derived from the quiet ink, so it is structurally dimmer than every enabled level on every theme. Re-author all soft roles at a 4.60 target with a rounding margin, rebuild the per-theme preview generator the rebase dropped, and add a Disabled row to every treatment sheet. * [Icons] Render preview glyphs at the sheet's device pixel ratio The preview sheets paint on a 2x painter but rasterized each glyph at its logical size, so every icon was upscaled on the way into the file and the sheets read as blurry. Render each glyph at device size and tag the pixmap with the ratio, so one source pixel lands on one file pixel. * [Icons] Keep the System semantic ladder on the text floor System authors no palette of its own, so its semantic family is fixed data measured against whatever surfaces the platform provides. The ladder that landed with the authored roles reused the old contrast-ordered values: PositiveSoft and NegativeSoft sat at 2.76–3.90:1 on common light and dark platform surfaces, and the strong level was less saturated than the secondary, which is the inversion the chroma rule removes. Re-author the six default semantic colors per scheme at the same 4.60 target the shipped themes use, against representative platform surfaces, and mirror them in System's palette files. The new DefaultSemanticFamilyMeetsTheLadderOnPlatformSurfaces test holds the floor and the saturation order there, and shippedPalette's early return now says why System is outside the authored-palette assertions. * [Icons] Apply the CI clang-format output to the new tests * [Icons] Adapt the treatment preview to the authored roles The preview file is inherited from the treatment PR. Here the palette already authors the fill tone and the badge takes an explicit scheme, so the generator stops re-saturating the role and passes the scheme the sheet renders. * [Icons] Author neutral System icon ink The System theme derived icon ink from the platform palette, which rendered blue under the default palette. Author Icon/IconStrong/IconSoft explicitly: a black ladder in light mode, a white ladder in dark mode. Pin authorship, achromaticity and ordering in the render test. * Address review findings
82 lines
2.4 KiB
TOML
82 lines
2.4 KiB
TOML
# Fabric — light identity palette (navy-cloth chrome)
|
|
[Palette]
|
|
WindowText = #1c2330
|
|
Button = #c8d6ea
|
|
Light = #ffffff
|
|
Midlight = #b9c6dc
|
|
Dark = #8fa0bd
|
|
Mid = #a3b3cd
|
|
Text = #1c2330
|
|
BrightText = #1d4fa0
|
|
ButtonText = #141c29
|
|
Base = #f6f8fc
|
|
Window = #dbe3ef
|
|
Shadow = #5a6a85
|
|
Highlight = #2f6fd6
|
|
HighlightedText = #ffffff
|
|
Link = #2555b0
|
|
LinkVisited = #6a4bb8
|
|
AlternateBase = #e9eef7
|
|
ToolTipBase = #e9eff8
|
|
ToolTipText = #141c29
|
|
PlaceholderText = #7a1c2330
|
|
Accent = #2f6fd6
|
|
|
|
[Palette.Disabled]
|
|
WindowText = #787878
|
|
Button = #dbe3ef
|
|
Light = #ffffff
|
|
Midlight = #b9c6dc
|
|
Dark = #8fa0bd
|
|
Mid = #a3b3cd
|
|
Text = #787878
|
|
BrightText = #1d4fa0
|
|
ButtonText = #969696
|
|
Base = #dbe3ef
|
|
Window = #dbe3ef
|
|
Shadow = #5a6a85
|
|
Highlight = #cdd8e9
|
|
HighlightedText = #787878
|
|
Link = #0000ff
|
|
LinkVisited = #ff00ff
|
|
AlternateBase = #e9eef7
|
|
ToolTipBase = #e9eff8
|
|
ToolTipText = #141c29
|
|
PlaceholderText = #7a1c2330
|
|
Accent = #787878
|
|
|
|
[Palette.Inactive]
|
|
WindowText = #1c2330
|
|
Button = #c8d6ea
|
|
Light = #ffffff
|
|
Midlight = #b9c6dc
|
|
Dark = #8fa0bd
|
|
Mid = #a3b3cd
|
|
Text = #1c2330
|
|
BrightText = #1d4fa0
|
|
ButtonText = #141c29
|
|
Base = #f6f8fc
|
|
Window = #dbe3ef
|
|
Shadow = #5a6a85
|
|
Highlight = #cdd8e9
|
|
HighlightedText = #000000
|
|
Link = #2555b0
|
|
LinkVisited = #6a4bb8
|
|
AlternateBase = #e9eef7
|
|
ToolTipBase = #e9eff8
|
|
ToolTipText = #141c29
|
|
PlaceholderText = #7a1c2330
|
|
Accent = #2f6fd6
|
|
|
|
[AppColors]
|
|
AccentStrong = #3a6fd6
|
|
AccentSoft = #8fb8f2
|
|
Icon = #2f58ac
|
|
IconStrong = #054ddf
|
|
IconSoft = #505c76
|
|
Positive = #166931
|
|
PositiveStrong = #006b22
|
|
PositiveSoft = #40634b
|
|
Negative = #b0251d
|
|
NegativeStrong = #ba0a00
|
|
NegativeSoft = #7c504d
|