fix(creation-screen): the white text, the badge on top of the roll, and a window too big for the laptop
The human's first F6 run found four defects headless GUT could not see, all now fixed and break-proven. 1. Fifteen Labels shipped invisible. _fonts() sets a default font and size but never a default font_color for the base Label type, so a Label with no type-variation inherited Godot's built-in default — WHITE — and rendered white-on-parchment: the four race names, four race blurbs, and seven calling names, every unreadable string on the sheet. New CardTitle / CardBody roles (mock #3a2f1c / #6a5a3a) fix it. NOT a global default Label colour: the Title screen has 12 bare Labels on a dark background that rely on white. 2. The PRIMARY badge covered the rolled value. The ability card is a PanelContainer, and a Container force-fits its children, so the badge's authored anchors were dead letters — it stretched to the card's full width and centred over the value. Nesting it under a plain Control (not a Container) restores absolute positioning. The badges also carried _flat()'s 12/6 card padding; a new tight pill stylebox matches the mock's 2px 9px. 3. Race cards overflowed their own border (108px card, 114px of content). Bumped to 140. The CHOSEN badge on the calling card moved from centre to the mock's top-right, and the ability card got its own AbilityCard variation with 16px top headroom for the badge (ParchmentCard is shared with the shell). 4. The default window (1600x900) was larger than a 1600x900 laptop's usable area, so the WM clamped it to 1589x752 and the run came up pillarboxed. Default is now 1280x720, resizable; the 1920x1080 design canvas is unchanged (canvas_items + keep scales it, so no layout number moved). Also closes M4-b's two open copy items: the cutpurse origin fragment (it contradicted its own blurb) and the Hint label (it omitted the roll's floor of 8, now pinned to NewGame.roll_attributes). Guards for 1-4 are new and each was re-broken and watched go red. The overflow guard in 3 was FIRST WRITTEN AS A TAUTOLOGY — Godot clamps Control.size up to its combined minimum, so `min <= size` is `x <= x` — and passed against the bug, 29/29, until it was rewritten to measure against the card that clips. That is traps.md #17 and the thirteenth cannot-fail assertion this branch has caught. 319 client tests green, content build green, theme drift guard satisfied. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -50,6 +50,23 @@ static func build_theme() -> Theme:
|
||||
return theme
|
||||
|
||||
|
||||
static func _pill(bg: Color, radius: int, margin_x: int, margin_y: int) -> StyleBoxFlat:
|
||||
# A BADGE, not a card. _flat() bakes in the 12/6 content margin every panel and
|
||||
# button on the sheet wants — on a 9px "PRIMARY" flag that padding is most of the
|
||||
# control, which is what made the badge swallow the ability card's rolled value.
|
||||
# The mock's flags are padding:2px 9px (PRIMARY) and 3px 8px (CHOSEN).
|
||||
var s := StyleBoxFlat.new()
|
||||
s.bg_color = bg
|
||||
s.border_color = bg
|
||||
s.set_border_width_all(0)
|
||||
s.set_corner_radius_all(radius)
|
||||
s.content_margin_left = margin_x
|
||||
s.content_margin_right = margin_x
|
||||
s.content_margin_top = margin_y
|
||||
s.content_margin_bottom = margin_y
|
||||
return s
|
||||
|
||||
|
||||
static func _flat(bg: Color, border: Color, width := 1, radius := 4) -> StyleBoxFlat:
|
||||
var s := StyleBoxFlat.new()
|
||||
s.bg_color = bg
|
||||
@@ -83,6 +100,20 @@ static func _fonts(theme: Theme) -> void:
|
||||
theme.set_font(&"font", ThemeKeys.MONO, load(MONO))
|
||||
theme.set_font_size(&"font_size", ThemeKeys.MONO, 13)
|
||||
theme.set_color(&"font_color", ThemeKeys.MONO, Palette.MUTED_MONO)
|
||||
# Card type — the name + blurb inside a select-card. These sit ON PARCHMENT, so
|
||||
# they take INK, not CREAM. Godot's built-in default Label colour is WHITE, and a
|
||||
# Label left bare inherits it: the race and calling names shipped invisible on the
|
||||
# parchment sheet for exactly that reason. There is no such thing as an unstyled
|
||||
# Label on this sheet — every one of them names a role. (mock: 19px/17px #3a2f1c
|
||||
# title, 13px italic-serif #6a5a3a blurb.)
|
||||
theme.set_type_variation(ThemeKeys.CARD_TITLE, "Label")
|
||||
theme.set_font(&"font", ThemeKeys.CARD_TITLE, serif)
|
||||
theme.set_font_size(&"font_size", ThemeKeys.CARD_TITLE, 19)
|
||||
theme.set_color(&"font_color", ThemeKeys.CARD_TITLE, Palette.INK_HEADING)
|
||||
theme.set_type_variation(ThemeKeys.CARD_BODY, "Label")
|
||||
theme.set_font(&"font", ThemeKeys.CARD_BODY, serif)
|
||||
theme.set_font_size(&"font_size", ThemeKeys.CARD_BODY, 13)
|
||||
theme.set_color(&"font_color", ThemeKeys.CARD_BODY, Palette.INK_MUTED)
|
||||
|
||||
|
||||
static func _title_type(theme: Theme) -> void:
|
||||
@@ -231,21 +262,38 @@ static func _tags_and_primary(theme: Theme) -> void:
|
||||
# calling's primary attribute wears. Label takes a `normal` stylebox in Godot 4.
|
||||
var chosen := ThemeKeys.CHOSEN_TAG
|
||||
theme.set_type_variation(chosen, "Label")
|
||||
theme.set_stylebox(&"normal", chosen, _flat(Palette.BLOOD, Palette.BLOOD, 1, 5))
|
||||
theme.set_stylebox(&"normal", chosen, _pill(Palette.BLOOD, 5, 8, 3))
|
||||
theme.set_font(&"font", chosen, load(MONO))
|
||||
theme.set_font_size(&"font_size", chosen, 10)
|
||||
theme.set_color(&"font_color", chosen, Palette.CREAM_BRIGHT)
|
||||
|
||||
var primary_tag := ThemeKeys.PRIMARY_TAG
|
||||
theme.set_type_variation(primary_tag, "Label")
|
||||
theme.set_stylebox(&"normal", primary_tag, _flat(Palette.INK_GOLD, Palette.INK_GOLD, 1, 5))
|
||||
theme.set_stylebox(&"normal", primary_tag, _pill(Palette.INK_GOLD, 5, 9, 2))
|
||||
theme.set_font(&"font", primary_tag, load(MONO))
|
||||
theme.set_font_size(&"font_size", primary_tag, 9)
|
||||
theme.set_color(&"font_color", primary_tag, Palette.CREAM_BRIGHT)
|
||||
|
||||
# The ability card in both states. It is NOT a plain ParchmentCard: it wears the PRIMARY
|
||||
# flag on its top edge, and _flat()'s 6px top margin puts the "STR" key label directly
|
||||
# under the badge — they collided. The mock's card is padding:16px 10px 14px, and that
|
||||
# 16px IS the headroom the badge needs. ParchmentCard cannot simply be retuned: the
|
||||
# shell shares it, and the shell has no badge.
|
||||
theme.set_stylebox(&"panel", ThemeKeys.ABILITY_CARD,
|
||||
_ability_card(Palette.PARCHMENT_BORDER, 1))
|
||||
theme.set_type_variation(ThemeKeys.ABILITY_CARD, "PanelContainer")
|
||||
theme.set_type_variation(ThemeKeys.PRIMARY_CARD, "PanelContainer")
|
||||
theme.set_stylebox(&"panel", ThemeKeys.PRIMARY_CARD,
|
||||
_flat(Palette.PARCHMENT_CARD, Palette.INK_GOLD, 2, 12))
|
||||
_ability_card(Palette.INK_GOLD, 2))
|
||||
|
||||
|
||||
static func _ability_card(border: Color, width: int) -> StyleBoxFlat:
|
||||
var s := _flat(Palette.PARCHMENT_CARD, border, width, 12)
|
||||
s.content_margin_top = 16
|
||||
s.content_margin_bottom = 14
|
||||
s.content_margin_left = 10
|
||||
s.content_margin_right = 10
|
||||
return s
|
||||
|
||||
|
||||
static func _tiles(theme: Theme) -> void:
|
||||
|
||||
Reference in New Issue
Block a user