From dcc12979450fa32ab4e805df555c2ff544a6ddc4 Mon Sep 17 00:00:00 2001 From: Jaap Marsman Date: Wed, 17 Aug 2022 17:28:41 +0800 Subject: [PATCH] added design files + continued work on UI --- .gitattributes | 1 + design_files/main_icon.afdesign | 3 +++ godot/start_menu.tscn | 4 ++-- godot/user_details.tscn | 21 +++++++++++++-------- godot/wb_theme.tres | 32 +++++++++++++++++++++++++++++++- 5 files changed, 50 insertions(+), 11 deletions(-) create mode 100644 design_files/main_icon.afdesign diff --git a/.gitattributes b/.gitattributes index f1b9535..990c995 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1,2 @@ godot/Assets/** filter=lfs diff=lfs merge=lfs -text +design_files/** filter=lfs diff=lfs merge=lfs -text diff --git a/design_files/main_icon.afdesign b/design_files/main_icon.afdesign new file mode 100644 index 0000000..a68db81 --- /dev/null +++ b/design_files/main_icon.afdesign @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9840e54c8af1038a8ceb52fe3c47cfb4ce9611d5a1dc6701522b4d6a584b3509 +size 110645 diff --git a/godot/start_menu.tscn b/godot/start_menu.tscn index 3a0e99c..9fd9097 100644 --- a/godot/start_menu.tscn +++ b/godot/start_menu.tscn @@ -18,9 +18,9 @@ unique_name_in_owner = true anchor_left = 0.5 anchor_right = 0.5 margin_left = -185.0 -margin_top = 7.0 +margin_top = 2.0 margin_right = 185.0 -margin_bottom = 38.0 +margin_bottom = 36.0 theme = ExtResource( 5 ) text = "All your base are belong to us" diff --git a/godot/user_details.tscn b/godot/user_details.tscn index 7353a98..6ce691c 100644 --- a/godot/user_details.tscn +++ b/godot/user_details.tscn @@ -1,6 +1,7 @@ -[gd_scene load_steps=2 format=2] +[gd_scene load_steps=3 format=2] [ext_resource path="res://button_user_save.gd" type="Script" id=1] +[ext_resource path="res://wb_theme.tres" type="Theme" id=2] [node name="user_details" type="CanvasLayer"] @@ -14,29 +15,33 @@ rect_min_size = Vector2( 1260, 610 ) [node name="label_first_time" type="Label" parent="user_menu"] unique_name_in_owner = true margin_right = 1260.0 -margin_bottom = 25.0 +margin_bottom = 34.0 +theme = ExtResource( 2 ) text = "First time user: Please fill in your FIRST NAME only below." [node name="textbox_user_name" type="LineEdit" parent="user_menu"] unique_name_in_owner = true -margin_top = 33.0 +margin_top = 42.0 margin_right = 1260.0 -margin_bottom = 78.0 +margin_bottom = 76.0 +theme = ExtResource( 2 ) caret_blink = true caret_blink_speed = 0.5 [node name="button_user_save" type="Button" parent="user_menu"] -margin_top = 86.0 +margin_top = 84.0 margin_right = 1260.0 -margin_bottom = 123.0 +margin_bottom = 118.0 +theme = ExtResource( 2 ) text = "OK" script = ExtResource( 1 ) [node name="button_birth_day" type="MenuButton" parent="user_menu"] -margin_top = 131.0 +margin_top = 126.0 margin_right = 1260.0 -margin_bottom = 168.0 +margin_bottom = 160.0 focus_mode = 2 +theme = ExtResource( 2 ) text = "Day" [connection signal="pressed" from="user_menu/button_user_save" to="user_menu/button_user_save" method="_on_button_user_save_pressed"] diff --git a/godot/wb_theme.tres b/godot/wb_theme.tres index 6dd7dc1..0d13a12 100644 --- a/godot/wb_theme.tres +++ b/godot/wb_theme.tres @@ -1,4 +1,4 @@ -[gd_resource type="Theme" load_steps=10 format=2] +[gd_resource type="Theme" load_steps=12 format=2] [ext_resource path="res://Assets/fonts/noto_sans_display_bold.ttf" type="DynamicFontData" id=1] [ext_resource path="res://Assets/fonts/noto_sans_display.ttf" type="DynamicFontData" id=2] @@ -8,8 +8,18 @@ size = 24 font_data = ExtResource( 1 ) [sub_resource type="StyleBoxFlat" id=4] +bg_color = Color( 0.207843, 0.219608, 0.317647, 1 ) +corner_radius_top_left = 10 +corner_radius_top_right = 10 +corner_radius_bottom_right = 10 +corner_radius_bottom_left = 10 [sub_resource type="StyleBoxFlat" id=5] +bg_color = Color( 0.862745, 0.435294, 0.329412, 1 ) +corner_radius_top_left = 10 +corner_radius_top_right = 10 +corner_radius_bottom_right = 10 +corner_radius_bottom_left = 10 [sub_resource type="StyleBoxFlat" id=6] bg_color = Color( 0.462745, 0.662745, 0.560784, 1 ) @@ -26,11 +36,29 @@ corner_radius_bottom_right = 10 corner_radius_bottom_left = 10 [sub_resource type="StyleBoxFlat" id=7] +bg_color = Color( 0.941176, 0.772549, 0.517647, 1 ) +corner_radius_top_left = 10 +corner_radius_top_right = 10 +corner_radius_bottom_right = 10 +corner_radius_bottom_left = 10 [sub_resource type="DynamicFont" id=3] size = 24 font_data = ExtResource( 2 ) +[sub_resource type="DynamicFont" id=8] +size = 24 +font_data = ExtResource( 2 ) + +[sub_resource type="StyleBoxFlat" id=9] +content_margin_left = 15.0 +content_margin_right = 5.0 +bg_color = Color( 0.207843, 0.219608, 0.317647, 1 ) +corner_radius_top_left = 10 +corner_radius_top_right = 10 +corner_radius_bottom_right = 10 +corner_radius_bottom_left = 10 + [resource] Button/fonts/font = SubResource( 1 ) Button/styles/disabled = SubResource( 4 ) @@ -39,3 +67,5 @@ Button/styles/hover = SubResource( 6 ) Button/styles/normal = SubResource( 2 ) Button/styles/pressed = SubResource( 7 ) Label/fonts/font = SubResource( 3 ) +LineEdit/fonts/font = SubResource( 8 ) +LineEdit/styles/normal = SubResource( 9 )