Skip to content

Update theme for 720p resolution #1168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wjt merged 10 commits into from
Sep 10, 2025
Merged

Update theme for 720p resolution #1168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
70f3256
Storybook: Fix ribbon height
wjt Sep 9, 2025
8023c92
theme: Reduce font sizes
wjt Sep 9, 2025
c5daceb
theme: Reduce RichTextLabel line separation
wjt Sep 10, 2025
fb0cc99
theme: Reduce PanelContainer left and right margins
wjt Sep 10, 2025
aa6ad05
theme: Reduce VBox/Grid separation
wjt Sep 10, 2025
9cdb0d6
dialogue: Reduce balloon size & spacing
wjt Sep 10, 2025
0e83805
credits: Reduce margins
wjt Sep 10, 2025
c39c4b2
credits: Merge right-hand panels
wjt Sep 10, 2025
2bff30a
theme: Reduce transparent margin around PanelContainer
manuq Sep 10, 2025
3a8a4f7
dialogue: Reduce minimum balloon size
wjt Sep 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions scenes/menus/storybook/components/storybook_page.tscn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ script = ExtResource("1_jl23h")
layout_mode = 2

[node name="TitleBox" type="PanelContainer" parent="VBoxContainer"]
custom_minimum_size = Vector2(0, 64)
layout_mode = 2
size_flags_horizontal = 0
theme_type_variation = &"PlayerRibbon"
Expand Down
65 changes: 25 additions & 40 deletions scenes/menus/title/components/credits.tscn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,47 +13,39 @@ grow_vertical = 2
theme = ExtResource("1_gmidg")
script = ExtResource("2_3tvx1")

[node name="MarginContainer" type="MarginContainer" parent="."]
[node name="VBoxContainer" type="VBoxContainer" parent="."]
layout_mode = 1
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
scale = Vector2(1, 1.03033)
theme_override_constants/margin_left = 64
theme_override_constants/margin_top = 32
theme_override_constants/margin_right = 64
theme_override_constants/margin_bottom = 64

[node name="VBoxContainer" type="VBoxContainer" parent="MarginContainer"]
layout_mode = 2

[node name="HBoxContainer" type="HBoxContainer" parent="MarginContainer/VBoxContainer"]
[node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer"]
layout_mode = 2
size_flags_vertical = 3
alignment = 1

[node name="Authors" type="PanelContainer" parent="MarginContainer/VBoxContainer/HBoxContainer"]
[node name="Authors" type="PanelContainer" parent="VBoxContainer/HBoxContainer"]
layout_mode = 2
size_flags_horizontal = 3

[node name="VBoxContainer" type="VBoxContainer" parent="MarginContainer/VBoxContainer/HBoxContainer/Authors"]
[node name="VBoxContainer" type="VBoxContainer" parent="VBoxContainer/HBoxContainer/Authors"]
layout_mode = 2

[node name="TitlePanel" type="PanelContainer" parent="MarginContainer/VBoxContainer/HBoxContainer/Authors/VBoxContainer"]
[node name="TitlePanel" type="PanelContainer" parent="VBoxContainer/HBoxContainer/Authors/VBoxContainer"]
custom_minimum_size = Vector2(0, 64)
layout_mode = 2
size_flags_horizontal = 0
theme_type_variation = &"PlayerRibbon"

[node name="Title" type="Label" parent="MarginContainer/VBoxContainer/HBoxContainer/Authors/VBoxContainer/TitlePanel"]
[node name="Title" type="Label" parent="VBoxContainer/HBoxContainer/Authors/VBoxContainer/TitlePanel"]
layout_mode = 2
mouse_filter = 1
text = "Authors"
horizontal_alignment = 1

[node name="Body" type="RichTextLabel" parent="MarginContainer/VBoxContainer/HBoxContainer/Authors/VBoxContainer"]
[node name="Body" type="RichTextLabel" parent="VBoxContainer/HBoxContainer/Authors/VBoxContainer"]
layout_mode = 2
size_flags_vertical = 3
bbcode_enabled = true
Expand All @@ -72,78 +64,71 @@ Stephen Reid
Tobías Romero
Will Thompson"

[node name="VBoxContainer" type="VBoxContainer" parent="MarginContainer/VBoxContainer/HBoxContainer"]
[node name="VBoxContainer" type="VBoxContainer" parent="VBoxContainer/HBoxContainer"]
layout_mode = 2
size_flags_horizontal = 3

[node name="Art" type="PanelContainer" parent="MarginContainer/VBoxContainer/HBoxContainer/VBoxContainer"]
[node name="Art" type="PanelContainer" parent="VBoxContainer/HBoxContainer/VBoxContainer"]
layout_mode = 2
size_flags_horizontal = 3
size_flags_vertical = 3
size_flags_stretch_ratio = 0.72

[node name="VBoxContainer" type="VBoxContainer" parent="MarginContainer/VBoxContainer/HBoxContainer/VBoxContainer/Art"]
[node name="VBoxContainer" type="VBoxContainer" parent="VBoxContainer/HBoxContainer/VBoxContainer/Art"]
layout_mode = 2

[node name="TitlePanel" type="PanelContainer" parent="MarginContainer/VBoxContainer/HBoxContainer/VBoxContainer/Art/VBoxContainer"]
[node name="ArtTitlePanel" type="PanelContainer" parent="VBoxContainer/HBoxContainer/VBoxContainer/Art/VBoxContainer"]
custom_minimum_size = Vector2(0, 64)
layout_mode = 2
size_flags_horizontal = 0
theme_type_variation = &"NPCRibbon"

[node name="Title" type="Label" parent="MarginContainer/VBoxContainer/HBoxContainer/VBoxContainer/Art/VBoxContainer/TitlePanel"]
[node name="Title" type="Label" parent="VBoxContainer/HBoxContainer/VBoxContainer/Art/VBoxContainer/ArtTitlePanel"]
layout_mode = 2
mouse_filter = 1
text = "Art and Music"
horizontal_alignment = 1

[node name="Body" type="RichTextLabel" parent="MarginContainer/VBoxContainer/HBoxContainer/VBoxContainer/Art/VBoxContainer"]
[node name="ArtBody" type="RichTextLabel" parent="VBoxContainer/HBoxContainer/VBoxContainer/Art/VBoxContainer"]
layout_mode = 2
size_flags_vertical = 3
bbcode_enabled = true
text = "Additional original art by [url=https://pixelfrog-assets.itch.io/]Pixel Frog[/url]
Original music by John Wright"

[node name="ThirdPartyComponents" type="PanelContainer" parent="MarginContainer/VBoxContainer/HBoxContainer/VBoxContainer"]
layout_mode = 2
size_flags_horizontal = 3
size_flags_vertical = 3

[node name="VBoxContainer" type="VBoxContainer" parent="MarginContainer/VBoxContainer/HBoxContainer/VBoxContainer/ThirdPartyComponents"]
layout_mode = 2

[node name="TitlePanel" type="PanelContainer" parent="MarginContainer/VBoxContainer/HBoxContainer/VBoxContainer/ThirdPartyComponents/VBoxContainer"]
[node name="ThirdPartyTitlePanel" type="PanelContainer" parent="VBoxContainer/HBoxContainer/VBoxContainer/Art/VBoxContainer"]
custom_minimum_size = Vector2(0, 64)
layout_mode = 2
size_flags_horizontal = 0
theme_type_variation = &"NPCRibbon"

[node name="Title" type="Label" parent="MarginContainer/VBoxContainer/HBoxContainer/VBoxContainer/ThirdPartyComponents/VBoxContainer/TitlePanel"]
[node name="Title" type="Label" parent="VBoxContainer/HBoxContainer/VBoxContainer/Art/VBoxContainer/ThirdPartyTitlePanel"]
layout_mode = 2
mouse_filter = 1
text = "Third-Party Components"
horizontal_alignment = 1

[node name="Body" type="RichTextLabel" parent="MarginContainer/VBoxContainer/HBoxContainer/VBoxContainer/ThirdPartyComponents/VBoxContainer"]
[node name="ThirdPartyBody" type="RichTextLabel" parent="VBoxContainer/HBoxContainer/VBoxContainer/Art/VBoxContainer"]
layout_mode = 2
size_flags_vertical = 3
size_flags_stretch_ratio = 2.0
bbcode_enabled = true
text = "Built with [url=https://godotengine.org/]Godot Engine[/url] ([url=https://godotengine.org/license/]MIT license[/url])
Uses [url=https://dialogue.nathanhoad.net/]Godot Dialogue Manager[/url] by Nathan Hoad ([url=https://github.com/nathanhoad/godot_dialogue_manager/blob/main/LICENSE]MIT license[/url])
Uses [url=https://dialogue.nathanhoad.net/]Godot Git Describe[/url] by Joseph Michael Ware ([url=https://github.com/zibetnu/godot-git-describe/blob/main/LICENSE]MIT license[/url])
Uses [url=https://github.com/scfried/soft-type-jersey]Jersey[/url] by Sarah Cadigan-Fried and The Soft Type Project Authors ([url=https://github.com/scfried/soft-type-jersey?tab=OFL-1.1-1-ov-file]OFL-1.1 license[/url])"

[node name="BackButton" type="Button" parent="MarginContainer/VBoxContainer"]
[node name="BackButton" type="Button" parent="VBoxContainer"]
unique_name_in_owner = true
layout_mode = 2
size_flags_horizontal = 4
theme_type_variation = &"BigFlatButton"
theme_type_variation = &"FlatButton"
text = "< back"
flat = true

[connection signal="meta_clicked" from="MarginContainer/VBoxContainer/HBoxContainer/Authors/VBoxContainer/Body" to="." method="_on_rich_text_label_meta_clicked"]
[connection signal="meta_clicked" from="MarginContainer/VBoxContainer/HBoxContainer/VBoxContainer/Art/VBoxContainer/Body" to="." method="_on_rich_text_label_meta_clicked"]
[connection signal="visibility_changed" from="MarginContainer/VBoxContainer/HBoxContainer/VBoxContainer/Art/VBoxContainer/Body" to="." method="_on_visibility_changed"]
[connection signal="meta_clicked" from="MarginContainer/VBoxContainer/HBoxContainer/VBoxContainer/ThirdPartyComponents/VBoxContainer/Body" to="." method="_on_rich_text_label_meta_clicked"]
[connection signal="visibility_changed" from="MarginContainer/VBoxContainer/HBoxContainer/VBoxContainer/ThirdPartyComponents/VBoxContainer/Body" to="." method="_on_visibility_changed"]
[connection signal="pressed" from="MarginContainer/VBoxContainer/BackButton" to="." method="_on_back_button_pressed"]
[connection signal="meta_clicked" from="VBoxContainer/HBoxContainer/Authors/VBoxContainer/Body" to="." method="_on_rich_text_label_meta_clicked"]
[connection signal="meta_clicked" from="VBoxContainer/HBoxContainer/VBoxContainer/Art/VBoxContainer/ArtBody" to="." method="_on_rich_text_label_meta_clicked"]
[connection signal="visibility_changed" from="VBoxContainer/HBoxContainer/VBoxContainer/Art/VBoxContainer/ArtBody" to="." method="_on_visibility_changed"]
[connection signal="meta_clicked" from="VBoxContainer/HBoxContainer/VBoxContainer/Art/VBoxContainer/ThirdPartyBody" to="." method="_on_rich_text_label_meta_clicked"]
[connection signal="visibility_changed" from="VBoxContainer/HBoxContainer/VBoxContainer/Art/VBoxContainer/ThirdPartyBody" to="." method="_on_visibility_changed"]
[connection signal="pressed" from="VBoxContainer/BackButton" to="." method="_on_back_button_pressed"]
30 changes: 18 additions & 12 deletions scenes/ui_elements/components/theme.tres
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
[gd_resource type="Theme" load_steps=26 format=3 uid="uid://cvitou84ni7qe"]
[gd_resource type="Theme" load_steps=27 format=3 uid="uid://cvitou84ni7qe"]

[ext_resource type="Texture2D" uid="uid://dv7kcbngjjwq7" path="res://assets/third_party/tiny-swords/UI/Buttons/Button_Blue_3Slides.png" id="1_0xtm5"]
[ext_resource type="Texture2D" uid="uid://bxk0fu4vv6wt2" path="res://assets/third_party/tiny-swords/UI/Buttons/Button_Hover_3Slides.png" id="1_1romn"]
[ext_resource type="FontFile" uid="uid://h5l8lrmk1r02" path="res://assets/third_party/fonts/jersey/Jersey25-Regular.ttf" id="1_cjtkl"]
[ext_resource type="Texture2D" uid="uid://bqe8u2t2tsoma" path="res://assets/third_party/tiny-swords/UI/Buttons/Button_Disable_3Slides.png" id="1_rcupm"]
[ext_resource type="Texture2D" uid="uid://rwt2v0hex5nm" path="res://assets/third_party/tiny-swords/UI/Ribbons/Ribbon_Yellow_3Slides.png" id="1_rtjv3"]
[ext_resource type="Texture2D" uid="uid://dcum6i8n2paam" path="res://assets/third_party/tiny-swords/UI/Buttons/Button_Blue_3Slides_Pressed.png" id="4_si72l"]
[ext_resource type="Texture2D" uid="uid://ccavio2v8sk7c" path="res://assets/third_party/tiny-swords/UI/Banners/Carved_3Slides.png" id="5_7k42u"]
[ext_resource type="Texture2D" uid="uid://c3yokak1jgx7" path="res://assets/third_party/tiny-swords/UI/Banners/Banner_Vertical.png" id="5_mu1ca"]
[ext_resource type="Texture2D" uid="uid://1po5xmfs16ot" path="res://assets/third_party/tiny-swords/UI/Ribbons/Ribbon_BlueLight_3Slides.png" id="7_mtpqe"]
[ext_resource type="FontFile" uid="uid://c3bb7lmvdqc5e" path="res://assets/third_party/fonts/jersey/Jersey20-Regular.ttf" id="10_cjtkl"]
[ext_resource type="FontFile" uid="uid://db8kp7xkv7gyn" path="res://assets/third_party/fonts/jersey/Jersey15-Regular.ttf" id="9_ig61n"]

[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_iy6d2"]
texture = ExtResource("1_rcupm")
Expand Down Expand Up @@ -118,15 +119,19 @@ axis_stretch_horizontal = 2
axis_stretch_vertical = 2

[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_mu1ca"]
content_margin_left = 96.0
content_margin_top = 64.0
content_margin_right = 96.0
content_margin_left = 64.0
content_margin_top = 48.0
content_margin_right = 64.0
content_margin_bottom = 64.0
texture = ExtResource("5_mu1ca")
texture_margin_left = 64.0
texture_margin_top = 64.0
texture_margin_right = 64.0
texture_margin_bottom = 64.0
expand_margin_left = 16.0
expand_margin_top = 16.0
expand_margin_right = 16.0
expand_margin_bottom = 16.0
axis_stretch_horizontal = 1
axis_stretch_vertical = 1

Expand All @@ -139,10 +144,11 @@ axis_stretch_horizontal = 2
axis_stretch_vertical = 2

[resource]
default_font = ExtResource("10_cjtkl")
default_font_size = 34
default_font = ExtResource("9_ig61n")
default_font_size = 27
BigFlatButton/base_type = &"FlatButton"
BigFlatButton/font_sizes/font_size = 68
BigFlatButton/font_sizes/font_size = 41
BigFlatButton/fonts/font = ExtResource("1_cjtkl")
Button/colors/font_color = Color(0.12, 0.12, 0.12, 1)
Button/colors/font_disabled_color = Color(0.12, 0.12, 0.12, 0.501961)
Button/colors/font_focus_color = Color(0.05, 0.05, 0.05, 1)
Expand Down Expand Up @@ -170,8 +176,8 @@ FlatButton/styles/normal = SubResource("StyleBoxTexture_bbim3")
FlatButton/styles/pressed = SubResource("StyleBoxTexture_3vcfk")
FlatNextButton/base_type = &"FlatButton"
FlatNextButton/styles/normal = SubResource("StyleBoxTexture_qndbo")
GridContainer/constants/h_separation = 32
GridContainer/constants/v_separation = 32
GridContainer/constants/h_separation = 21
GridContainer/constants/v_separation = 21
HintLabel/base_type = &"Label"
HintLabel/colors/font_color = Color(1, 1, 1, 1)
HintLabel/colors/font_shadow_color = Color(0, 0, 0, 1)
Expand All @@ -188,5 +194,5 @@ PanelContainer/styles/panel = SubResource("StyleBoxTexture_mu1ca")
PlayerRibbon/base_type = &"PanelContainer"
PlayerRibbon/styles/panel = SubResource("StyleBoxTexture_qmeow")
RichTextLabel/colors/default_color = Color(0, 0, 0, 1)
RichTextLabel/constants/line_separation = 9
VBoxContainer/constants/separation = 32
RichTextLabel/constants/line_separation = 3
VBoxContainer/constants/separation = 21
22 changes: 6 additions & 16 deletions scenes/ui_elements/dialogue/balloon.tscn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ theme = ExtResource("2_pfnde")

[node name="PanelContainer" type="PanelContainer" parent="Balloon"]
layout_mode = 0
offset_right = 384.0
offset_bottom = 384.0
offset_right = 480.0
offset_bottom = 359.0

[node name="VBoxContainer" type="VBoxContainer" parent="Balloon/PanelContainer"]
custom_minimum_size = Vector2(480, 192)
custom_minimum_size = Vector2(352, 128)
layout_mode = 2

[node name="CharacterPanel" type="PanelContainer" parent="Balloon/PanelContainer/VBoxContainer"]
Expand All @@ -48,26 +48,16 @@ size_flags_vertical = 3
text = "¡Ah! ¿Another wanderer? It’s been a while siñce aňyone çame löõkiŋ for instead of «treaßure»."
skip_action = &"dialogue_skip"

[node name="HBoxContainer" type="HBoxContainer" parent="Balloon/PanelContainer/VBoxContainer"]
layout_mode = 2
alignment = 2

[node name="NextButtonContainer" type="MarginContainer" parent="Balloon/PanelContainer/VBoxContainer/HBoxContainer"]
unique_name_in_owner = true
layout_mode = 2
theme_override_constants/margin_left = 0
theme_override_constants/margin_top = 0
theme_override_constants/margin_right = 0
theme_override_constants/margin_bottom = 30

[node name="NextButton" type="Button" parent="Balloon/PanelContainer/VBoxContainer/HBoxContainer/NextButtonContainer"]
[node name="NextButton" type="Button" parent="Balloon/PanelContainer/VBoxContainer"]
unique_name_in_owner = true
layout_mode = 2
size_flags_horizontal = 8
theme_type_variation = &"FlatNextButton"
text = "next >"

[node name="ResponsesMenu" type="VBoxContainer" parent="Balloon/PanelContainer/VBoxContainer" node_paths=PackedStringArray("response_template")]
unique_name_in_owner = true
visible = false
layout_mode = 2
size_flags_vertical = 8
theme_override_constants/separation = 2
Expand Down
8 changes: 2 additions & 6 deletions scenes/ui_elements/dialogue/components/balloon.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,6 @@ var _player_name: String = ""
## The label showing the currently spoken dialogue
@onready var dialogue_label: DialogueLabel = %DialogueLabel

## The “Next” button container, visible when the current line is complete and there are
## no response choices.
@onready var next_button_container: MarginContainer = %NextButtonContainer

## The “Next” button, to connect signals.
@onready var next_button: Button = %NextButton

Expand Down Expand Up @@ -140,7 +136,7 @@ func apply_dialogue_line() -> void:
responses_menu.hide()
responses_menu.responses = dialogue_line.responses

next_button_container.hide()
next_button.hide()

# Show our balloon
balloon.show()
Expand Down Expand Up @@ -169,7 +165,7 @@ func apply_dialogue_line() -> void:
is_waiting_for_input = true
balloon.focus_mode = Control.FOCUS_ALL
balloon.grab_focus()
next_button_container.show()
next_button.show()


## Go to the next line
Expand Down