mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-11-07 10:33:24 -08:00
876d66ffc9
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. |
||
|---|---|---|
| .. | ||
| card_zone_algorithms | ||
| carddatabase | ||
| deck_list_model | ||
| deck_list_zones | ||
| game | ||
| icon_assets | ||
| loading_from_clipboard | ||
| model_contract | ||
| movecard_tests | ||
| oracle | ||
| picture_loader_benchmark | ||
| settings | ||
| support | ||
| theme_migration | ||
| card_art_crop_test.cpp | ||
| card_update_progress_test.cpp | ||
| clamped_arithmetic_test.cpp | ||
| client_login_status_test.cpp | ||
| CMakeLists.txt | ||
| crash_reporter_test.cpp | ||
| deck_hash_performance_test.cpp | ||
| deck_state_manager_test.cpp | ||
| expression_test.cpp | ||
| font_config_test.cpp | ||
| forwarded_address_test.cpp | ||
| holder_line_test.cpp | ||
| installer_close_server_test.cpp | ||
| lag_monitor_test.cpp | ||
| latency_tracker_test.cpp | ||
| loader_local_matching_test.cpp | ||
| local_client_lifetime_test.cpp | ||
| metrics_registry_test.cpp | ||
| moxfield_signature_spells_test.cpp | ||
| password_hash_test.cpp | ||
| payload_paths_test.cpp | ||
| playmat_resolver_test.cpp | ||
| rate_limiter_test.cpp | ||
| report_categories_test.cpp | ||
| server_card_counter_test.cpp | ||
| server_counter_test.cpp | ||
| server_developer_role_test.cpp | ||
| server_dump_zone_test.cpp | ||
| server_forced_password_change_test.cpp | ||
| server_game_join_test.cpp | ||
| server_logger_test.cpp | ||
| server_moderator_role_test.cpp | ||
| server_rate_limiter_test.cpp | ||
| server_room_channels_test.cpp | ||
| single_instance_manager_test.cpp | ||
| spoiler_file_test.cpp | ||
| svg_recolor_test.cpp | ||
| test_age_formatting.cpp | ||
| translation_loader_test.cpp | ||
| translation_loader_test.ts | ||
| trusted_sources_test.cpp | ||
| user_data_backup_test.cpp | ||
| user_games_model_test.cpp | ||
| warning_categories_test.cpp | ||