From a8088662b7d64d68f404f157734ea158871b1037 Mon Sep 17 00:00:00 2001 From: Jaap Marsman Date: Sun, 6 Aug 2023 04:38:42 +0800 Subject: [PATCH] began conversion to Godot 4.1 --- godot/project.godot | 2 +- godot/start_screen.tscn | 36 ++++++++++++++++++++++++++++++++++++ godot/wb_theme.tres | 9 --------- 3 files changed, 37 insertions(+), 10 deletions(-) diff --git a/godot/project.godot b/godot/project.godot index 4e8ea78..819f6e3 100644 --- a/godot/project.godot +++ b/godot/project.godot @@ -12,7 +12,7 @@ config_version=5 config/name="Wellbeing App" run/main_scene="res://start_screen.tscn" -config/features=PackedStringArray("4.0") +config/features=PackedStringArray("4.1") run/low_processor_mode=true config/icon="res://Assets/icons/main_icon.png" diff --git a/godot/start_screen.tscn b/godot/start_screen.tscn index 9cc6d0e..b4fa0b9 100644 --- a/godot/start_screen.tscn +++ b/godot/start_screen.tscn @@ -36,9 +36,17 @@ visible = false [node name="welcome_title" parent="UI/top_container/start_menu" index="0"] anchors_preset = 5 +offset_top = 0.0 +offset_bottom = 34.0 +grow_horizontal = 2 [node name="version_label" parent="UI/top_container/start_menu" index="2"] anchors_preset = 2 +offset_left = 0.0 +offset_top = -30.0 +offset_right = 1275.0 +offset_bottom = 0.0 +grow_vertical = 0 [node name="button_daily_action" parent="UI/top_container/start_menu/GridContainer" index="0"] layout_mode = 2 @@ -63,18 +71,38 @@ visible = false [node name="user_menu" parent="UI/top_container/user_details" index="0"] anchors_preset = 8 +grow_horizontal = 2 +grow_vertical = 2 [node name="green_panel" parent="UI/top_container/user_details/user_menu" index="0"] layout_mode = 2 [node name="label_first_time" parent="UI/top_container/user_details/user_menu/green_panel" index="0"] layout_mode = 0 +anchor_right = 0.0 +offset_top = 0.0 +offset_right = 1.0 +offset_bottom = 34.0 [node name="textbox_user_name" parent="UI/top_container/user_details/user_menu/green_panel" index="1"] layout_mode = 0 +anchor_left = 0.0 +anchor_right = 0.0 +offset_left = 0.0 +offset_top = 0.0 +offset_right = 700.0 +offset_bottom = 34.0 [node name="birthday_selector" parent="UI/top_container/user_details/user_menu/green_panel" index="2"] layout_mode = 0 +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +offset_left = 0.0 +offset_top = 0.0 +offset_right = 267.0 +offset_bottom = 34.0 [node name="button_birth_month" parent="UI/top_container/user_details/user_menu/green_panel/birthday_selector" index="0"] layout_mode = 2 @@ -84,6 +112,14 @@ layout_mode = 2 [node name="button_user_save" parent="UI/top_container/user_details/user_menu/green_panel" index="3"] layout_mode = 0 +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +offset_left = 0.0 +offset_top = 0.0 +offset_right = 148.57 +offset_bottom = 34.0 [node name="daily_prompts" parent="UI/top_container" instance=ExtResource("4")] visible = false diff --git a/godot/wb_theme.tres b/godot/wb_theme.tres index 4768497..b2ff36f 100644 --- a/godot/wb_theme.tres +++ b/godot/wb_theme.tres @@ -5,9 +5,6 @@ [sub_resource type="FontFile" id="1"] fallbacks = Array[Font]([ExtResource("1")]) -face_index = null -embolden = null -transform = null cache/0/16/0/ascent = 0.0 cache/0/16/0/descent = 0.0 cache/0/16/0/underline_position = 0.0 @@ -52,9 +49,6 @@ corner_radius_bottom_left = 10 [sub_resource type="FontFile" id="3"] fallbacks = Array[Font]([ExtResource("2")]) -face_index = null -embolden = null -transform = null cache/0/16/0/ascent = 0.0 cache/0/16/0/descent = 0.0 cache/0/16/0/underline_position = 0.0 @@ -64,9 +58,6 @@ cache/0/16/0/kerning_overrides/16/0 = Vector2(0, 0) [sub_resource type="FontFile" id="8"] fallbacks = Array[Font]([ExtResource("2")]) -face_index = null -embolden = null -transform = null cache/0/16/0/ascent = 0.0 cache/0/16/0/descent = 0.0 cache/0/16/0/underline_position = 0.0