hz/step3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Restore Rz Coins caption and fix rank/ELO badge wrapping below toolbar

Browse Source 
Reverts the coin caption back to "Rz Coins" and shrinks the badge's
icons/fonts/spacing so both segments fit in the same footprint budget
the toolbar reserves. That budget was a hardcoded 900px sized for the
old single-segment badge; bump it to 960px to match the wider badge
instead of letting it overflow onto its own row.
This commit is contained in:
hz
2026-07-29 01:16:47 -05:00
parent 845907e825
commit f082be38e0
2 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/ui/credits_badge.gd
+18 -19
View File
@@ -20,7 +20,6 @@ var _initialized := false
func _ready() -> void: func _ready() -> void:
custom_minimum_size = Vector2(230, 44)
size_flags_vertical = Control.SIZE_SHRINK_CENTER size_flags_vertical = Control.SIZE_SHRINK_CENTER
_build_ui() _build_ui()
refresh_theme_controls() refresh_theme_controls()
@@ -33,22 +32,22 @@ func _ready() -> void:
func _build_ui() -> void: func _build_ui() -> void:
var margin := MarginContainer.new() var margin := MarginContainer.new()
margin.add_theme_constant_override("margin_left", 10) margin.add_theme_constant_override("margin_left", 7)
margin.add_theme_constant_override("margin_right", 10) margin.add_theme_constant_override("margin_right", 7)
margin.add_theme_constant_override("margin_top", 6) margin.add_theme_constant_override("margin_top", 5)
margin.add_theme_constant_override("margin_bottom", 6) margin.add_theme_constant_override("margin_bottom", 5)
add_child(margin) add_child(margin)
var row := HBoxContainer.new() var row := HBoxContainer.new()
row.add_theme_constant_override("separation", 8) row.add_theme_constant_override("separation", 5)
margin.add_child(row) margin.add_child(row)
rank_icon_panel = PanelContainer.new() rank_icon_panel = PanelContainer.new()
rank_icon_panel.custom_minimum_size = Vector2(28, 28) rank_icon_panel.custom_minimum_size = Vector2(22, 22)
rank_icon_panel.size_flags_vertical = Control.SIZE_SHRINK_CENTER rank_icon_panel.size_flags_vertical = Control.SIZE_SHRINK_CENTER
rank_icon_texture = TextureRect.new() rank_icon_texture = TextureRect.new()
rank_icon_texture.texture = SHIELD_ICON rank_icon_texture.texture = SHIELD_ICON
rank_icon_texture.custom_minimum_size = Vector2(16, 16) rank_icon_texture.custom_minimum_size = Vector2(13, 13)
rank_icon_texture.expand_mode = TextureRect.EXPAND_IGNORE_SIZE rank_icon_texture.expand_mode = TextureRect.EXPAND_IGNORE_SIZE
rank_icon_texture.stretch_mode = TextureRect.STRETCH_KEEP_ASPECT_CENTERED rank_icon_texture.stretch_mode = TextureRect.STRETCH_KEEP_ASPECT_CENTERED
rank_icon_panel.add_child(rank_icon_texture) rank_icon_panel.add_child(rank_icon_texture)
@@ -59,25 +58,25 @@ func _build_ui() -> void:
rank_copy.add_theme_constant_override("separation", 0) rank_copy.add_theme_constant_override("separation", 0)
rank_tier_label = Label.new() rank_tier_label = Label.new()
rank_tier_label.add_theme_font_override("font", Brand.font) rank_tier_label.add_theme_font_override("font", Brand.font)
rank_tier_label.add_theme_font_size_override("font_size", 15) rank_tier_label.add_theme_font_size_override("font_size", 13)
rank_copy.add_child(rank_tier_label) rank_copy.add_child(rank_tier_label)
rank_elo_label = Label.new() rank_elo_label = Label.new()
rank_elo_label.add_theme_font_override("font", Brand.font) rank_elo_label.add_theme_font_override("font", Brand.font)
rank_elo_label.add_theme_font_size_override("font_size", 10) rank_elo_label.add_theme_font_size_override("font_size", 9)
rank_copy.add_child(rank_elo_label) rank_copy.add_child(rank_elo_label)
row.add_child(rank_copy) row.add_child(rank_copy)
divider = ColorRect.new() divider = ColorRect.new()
divider.custom_minimum_size = Vector2(1, 26) divider.custom_minimum_size = Vector2(1, 22)
divider.size_flags_vertical = Control.SIZE_SHRINK_CENTER divider.size_flags_vertical = Control.SIZE_SHRINK_CENTER
row.add_child(divider) row.add_child(divider)
icon_panel = PanelContainer.new() icon_panel = PanelContainer.new()
icon_panel.custom_minimum_size = Vector2(28, 28) icon_panel.custom_minimum_size = Vector2(22, 22)
icon_panel.size_flags_vertical = Control.SIZE_SHRINK_CENTER icon_panel.size_flags_vertical = Control.SIZE_SHRINK_CENTER
icon_texture = TextureRect.new() icon_texture = TextureRect.new()
icon_texture.texture = STAR_ICON icon_texture.texture = STAR_ICON
icon_texture.custom_minimum_size = Vector2(16, 16) icon_texture.custom_minimum_size = Vector2(13, 13)
icon_texture.expand_mode = TextureRect.EXPAND_IGNORE_SIZE icon_texture.expand_mode = TextureRect.EXPAND_IGNORE_SIZE
icon_texture.stretch_mode = TextureRect.STRETCH_KEEP_ASPECT_CENTERED icon_texture.stretch_mode = TextureRect.STRETCH_KEEP_ASPECT_CENTERED
icon_panel.add_child(icon_texture) icon_panel.add_child(icon_texture)
@@ -88,18 +87,18 @@ func _build_ui() -> void:
copy.add_theme_constant_override("separation", 0) copy.add_theme_constant_override("separation", 0)
value_label = Label.new() value_label = Label.new()
value_label.add_theme_font_override("font", Brand.font) value_label.add_theme_font_override("font", Brand.font)
value_label.add_theme_font_size_override("font_size", 15) value_label.add_theme_font_size_override("font_size", 13)
copy.add_child(value_label) copy.add_child(value_label)
caption_label = Label.new() caption_label = Label.new()
caption_label.text = "RZ Points" caption_label.text = "Rz Coins"
caption_label.add_theme_font_override("font", Brand.font) caption_label.add_theme_font_override("font", Brand.font)
caption_label.add_theme_font_size_override("font_size", 10) caption_label.add_theme_font_size_override("font_size", 9)
copy.add_child(caption_label) copy.add_child(caption_label)
row.add_child(copy) row.add_child(copy)
var chevron := TextureRect.new() var chevron := TextureRect.new()
chevron.texture = CHEVRON_ICON chevron.texture = CHEVRON_ICON
chevron.custom_minimum_size = Vector2(14, 14) chevron.custom_minimum_size = Vector2(12, 12)
chevron.expand_mode = TextureRect.EXPAND_IGNORE_SIZE chevron.expand_mode = TextureRect.EXPAND_IGNORE_SIZE
chevron.stretch_mode = TextureRect.STRETCH_KEEP_ASPECT_CENTERED chevron.stretch_mode = TextureRect.STRETCH_KEEP_ASPECT_CENTERED
chevron.mouse_filter = Control.MOUSE_FILTER_IGNORE chevron.mouse_filter = Control.MOUSE_FILTER_IGNORE
@@ -110,12 +109,12 @@ func _build_ui() -> void:
func refresh_theme_controls() -> void: func refresh_theme_controls() -> void:
var dark := UIThemeService.is_dark_mode() var dark := UIThemeService.is_dark_mode()
add_theme_stylebox_override("panel", Brand.content_card_box(dark, true, Brand.ROYAL_BLUE)) add_theme_stylebox_override("panel", Brand.content_card_box(dark, true, Brand.ROYAL_BLUE))
rank_icon_panel.add_theme_stylebox_override("panel", Brand.icon_circle_box(dark, Brand.ROYAL_BLUE, 14)) rank_icon_panel.add_theme_stylebox_override("panel", Brand.icon_circle_box(dark, Brand.ROYAL_BLUE, 11))
rank_icon_texture.modulate = Brand.ROYAL_BLUE rank_icon_texture.modulate = Brand.ROYAL_BLUE
rank_tier_label.add_theme_color_override("font_color", Brand.text_color(dark)) rank_tier_label.add_theme_color_override("font_color", Brand.text_color(dark))
rank_elo_label.add_theme_color_override("font_color", Brand.ROYAL_BLUE) rank_elo_label.add_theme_color_override("font_color", Brand.ROYAL_BLUE)
divider.color = Color("2a365a") if dark else Brand.LIGHT_BORDER divider.color = Color("2a365a") if dark else Brand.LIGHT_BORDER
icon_panel.add_theme_stylebox_override("panel", Brand.icon_circle_box(dark, Brand.AMBER, 14)) icon_panel.add_theme_stylebox_override("panel", Brand.icon_circle_box(dark, Brand.AMBER, 11))
icon_texture.modulate = Brand.AMBER icon_texture.modulate = Brand.AMBER
value_label.add_theme_color_override("font_color", Brand.text_color(dark)) value_label.add_theme_color_override("font_color", Brand.text_color(dark))
caption_label.add_theme_color_override("font_color", Brand.muted_color(dark)) caption_label.add_theme_color_override("font_color", Brand.muted_color(dark))
scripts/ui/question_player.gd
+4 -4
View File
@@ -808,10 +808,10 @@ func _refresh_responsive_layout() -> void:
header_toolbar_host.reparent(target_parent) header_toolbar_host.reparent(target_parent)
header_toolbar_host.size_flags_horizontal = Control.SIZE_EXPAND_FILL if compact else Control.SIZE_SHRINK_END header_toolbar_host.size_flags_horizontal = Control.SIZE_EXPAND_FILL if compact else Control.SIZE_SHRINK_END
question_toolbar.size_flags_horizontal = Control.SIZE_EXPAND_FILL question_toolbar.size_flags_horizontal = Control.SIZE_EXPAND_FILL
# 12 bare 44px icon buttons + the wider 92px Feedback button + the 150px # 12 bare 44px icon buttons + the wider 92px Feedback button + the ~194px
# points badge, with 8px gaps between all 14 - anything less than this # rank/ELO + points badge, with 8px gaps between all 14 - anything less
# wraps onto a second row. # than this wraps onto a second row.
header_toolbar_host.custom_minimum_size.x = 0.0 if compact else 900.0 header_toolbar_host.custom_minimum_size.x = 0.0 if compact else 960.0
if size.x < 560.0: if size.x < 560.0:
nav_palette.columns = 5 nav_palette.columns = 5
else: else: