diff --git a/client/ui/chat/Chat.tscn b/client/ui/chat/Chat.tscn index ccfd5bf..ae240dd 100644 --- a/client/ui/chat/Chat.tscn +++ b/client/ui/chat/Chat.tscn @@ -13,6 +13,7 @@ script = ExtResource("1_sxxey") unique_name_in_owner = true layout_mode = 2 size_flags_vertical = 3 +focus_mode = 2 mouse_filter = 1 bbcode_enabled = true scroll_active = false diff --git a/client/ui/settings/Settings.tscn b/client/ui/settings/Settings.tscn index 7879056..fda5ded 100644 --- a/client/ui/settings/Settings.tscn +++ b/client/ui/settings/Settings.tscn @@ -33,6 +33,7 @@ anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 size_flags_horizontal = 3 +tab_alignment = 1 [node name="Video" type="MarginContainer" parent="TabContainer"] layout_mode = 2 diff --git a/client/ui/theme/stylebox/Button-hover.tres b/client/ui/theme/stylebox/Button-hover.tres new file mode 100644 index 0000000..9b545ee --- /dev/null +++ b/client/ui/theme/stylebox/Button-hover.tres @@ -0,0 +1,12 @@ +[gd_resource type="StyleBoxFlat" format=3 uid="uid://cyvmuvvhtygdb"] + +[resource] +content_margin_left = 8.0 +content_margin_top = 4.0 +content_margin_right = 8.0 +content_margin_bottom = 4.0 +bg_color = Color(0.47451, 0.34902, 0.219608, 1) +corner_radius_top_left = 3 +corner_radius_top_right = 3 +corner_radius_bottom_right = 3 +corner_radius_bottom_left = 3 diff --git a/client/ui/theme/stylebox/Button-pressed.tres b/client/ui/theme/stylebox/Button-pressed.tres new file mode 100644 index 0000000..cd7bd23 --- /dev/null +++ b/client/ui/theme/stylebox/Button-pressed.tres @@ -0,0 +1,12 @@ +[gd_resource type="StyleBoxFlat" format=3 uid="uid://dnio0tbxw8n22"] + +[resource] +content_margin_left = 8.0 +content_margin_top = 4.0 +content_margin_right = 8.0 +content_margin_bottom = 4.0 +bg_color = Color(0.313726, 0.223529, 0.133333, 1) +corner_radius_top_left = 3 +corner_radius_top_right = 3 +corner_radius_bottom_right = 3 +corner_radius_bottom_left = 3 diff --git a/client/ui/theme/stylebox/Button.tres b/client/ui/theme/stylebox/Button.tres new file mode 100644 index 0000000..636198c --- /dev/null +++ b/client/ui/theme/stylebox/Button.tres @@ -0,0 +1,15 @@ +[gd_resource type="StyleBoxFlat" format=3 uid="uid://dk1hxcdbwtl1p"] + +[resource] +content_margin_left = 8.0 +content_margin_top = 4.0 +content_margin_right = 8.0 +content_margin_bottom = 4.0 +bg_color = Color(0.403922, 0.294118, 0.180392, 1) +corner_radius_top_left = 3 +corner_radius_top_right = 3 +corner_radius_bottom_right = 3 +corner_radius_bottom_left = 3 +shadow_color = Color(0, 0, 0, 0.0627451) +shadow_size = 1 +shadow_offset = Vector2(1, 1) diff --git a/client/ui/theme/stylebox/Panel.tres b/client/ui/theme/stylebox/Panel.tres new file mode 100644 index 0000000..141f3ab --- /dev/null +++ b/client/ui/theme/stylebox/Panel.tres @@ -0,0 +1,15 @@ +[gd_resource type="StyleBoxTexture" load_steps=2 format=3 uid="uid://cg53fq4hjfar5"] + +[ext_resource type="Texture2D" uid="uid://dqlajdpahpifq" path="res://assets/ui/panel/brown.png" id="1_jy1si"] + +[resource] +content_margin_left = 6.0 +content_margin_top = 6.0 +content_margin_right = 6.0 +content_margin_bottom = 6.0 +texture = ExtResource("1_jy1si") +texture_margin_left = 24.0 +texture_margin_top = 24.0 +texture_margin_right = 24.0 +texture_margin_bottom = 24.0 +modulate_color = Color(1, 1, 1, 0.752941) diff --git a/client/ui/theme/stylebox/Tab-hover.tres b/client/ui/theme/stylebox/Tab-hover.tres new file mode 100644 index 0000000..2c5cd4b --- /dev/null +++ b/client/ui/theme/stylebox/Tab-hover.tres @@ -0,0 +1,13 @@ +[gd_resource type="StyleBoxTexture" load_steps=2 format=3 uid="uid://ckwitifx0qqf6"] + +[ext_resource type="Texture2D" uid="uid://b6igdr0gj54vk" path="res://assets/ui/panel/brown-tab-separated.png" id="1_dpf6p"] + +[resource] +content_margin_left = 12.0 +content_margin_right = 12.0 +texture = ExtResource("1_dpf6p") +texture_margin_left = 8.0 +texture_margin_top = 8.0 +texture_margin_right = 8.0 +texture_margin_bottom = 8.0 +modulate_color = Color(0.752941, 0.752941, 0.752941, 0.878431) diff --git a/client/ui/theme/stylebox/Tab-unselected.tres b/client/ui/theme/stylebox/Tab-unselected.tres new file mode 100644 index 0000000..e547662 --- /dev/null +++ b/client/ui/theme/stylebox/Tab-unselected.tres @@ -0,0 +1,13 @@ +[gd_resource type="StyleBoxTexture" load_steps=2 format=3 uid="uid://ci243v4aj450q"] + +[ext_resource type="Texture2D" uid="uid://b6igdr0gj54vk" path="res://assets/ui/panel/brown-tab-separated.png" id="1_ctgoj"] + +[resource] +content_margin_left = 12.0 +content_margin_right = 12.0 +texture = ExtResource("1_ctgoj") +texture_margin_left = 8.0 +texture_margin_top = 8.0 +texture_margin_right = 8.0 +texture_margin_bottom = 8.0 +modulate_color = Color(0.376471, 0.376471, 0.376471, 0.878431) diff --git a/client/ui/theme/stylebox/Tab.tres b/client/ui/theme/stylebox/Tab.tres new file mode 100644 index 0000000..a49961a --- /dev/null +++ b/client/ui/theme/stylebox/Tab.tres @@ -0,0 +1,13 @@ +[gd_resource type="StyleBoxTexture" load_steps=2 format=3 uid="uid://cb2j4iw73txac"] + +[ext_resource type="Texture2D" uid="uid://b6igdr0gj54vk" path="res://assets/ui/panel/brown-tab-separated.png" id="1_fydn7"] + +[resource] +content_margin_left = 12.0 +content_margin_right = 12.0 +texture = ExtResource("1_fydn7") +texture_margin_left = 8.0 +texture_margin_top = 8.0 +texture_margin_right = 8.0 +texture_margin_bottom = 8.0 +modulate_color = Color(1, 1, 1, 0.878431) diff --git a/client/ui/theme/theme.tres b/client/ui/theme/theme.tres index 003fe43..2a1e231 100644 --- a/client/ui/theme/theme.tres +++ b/client/ui/theme/theme.tres @@ -1,12 +1,46 @@ -[gd_resource type="Theme" load_steps=2 format=3 uid="uid://caqphxkvcu3tb"] +[gd_resource type="Theme" load_steps=15 format=3 uid="uid://caqphxkvcu3tb"] [ext_resource type="FontFile" uid="uid://b7mov13kwi8u8" path="res://assets/font/ubuntu_nf_regular.ttf" id="1_1unma"] +[ext_resource type="StyleBox" uid="uid://dk1hxcdbwtl1p" path="res://ui/theme/stylebox/Button.tres" id="1_64o2o"] +[ext_resource type="StyleBox" uid="uid://cyvmuvvhtygdb" path="res://ui/theme/stylebox/Button-hover.tres" id="1_g15ky"] +[ext_resource type="StyleBox" uid="uid://cg53fq4hjfar5" path="res://ui/theme/stylebox/Panel.tres" id="1_jbbe6"] +[ext_resource type="StyleBox" uid="uid://dnio0tbxw8n22" path="res://ui/theme/stylebox/Button-pressed.tres" id="3_b381q"] +[ext_resource type="StyleBox" uid="uid://cb2j4iw73txac" path="res://ui/theme/stylebox/Tab.tres" id="3_eh5tl"] +[ext_resource type="StyleBox" uid="uid://ci243v4aj450q" path="res://ui/theme/stylebox/Tab-unselected.tres" id="3_m6qhe"] +[ext_resource type="StyleBox" uid="uid://ckwitifx0qqf6" path="res://ui/theme/stylebox/Tab-hover.tres" id="3_vutoc"] + +[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_m3xql"] + +[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_uhs5i"] + +[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_iug8p"] + +[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_cqvpu"] + +[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_dlqb7"] + +[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_n8c5w"] [resource] default_font = ExtResource("1_1unma") default_font_size = 20 +Button/styles/focus = SubResource("StyleBoxEmpty_m3xql") +Button/styles/hover = ExtResource("1_g15ky") +Button/styles/normal = ExtResource("1_64o2o") +Button/styles/pressed = ExtResource("3_b381q") +CheckButton/styles/hover = SubResource("StyleBoxEmpty_uhs5i") +CheckButton/styles/hover_pressed = SubResource("StyleBoxEmpty_iug8p") +CheckButton/styles/normal = SubResource("StyleBoxEmpty_cqvpu") +CheckButton/styles/pressed = SubResource("StyleBoxEmpty_dlqb7") Label/colors/font_shadow_color = Color(0, 0, 0, 0.25) MarginContainer/constants/margin_bottom = 12 MarginContainer/constants/margin_left = 12 MarginContainer/constants/margin_right = 12 MarginContainer/constants/margin_top = 12 +Panel/styles/panel = ExtResource("1_jbbe6") +PanelContainer/styles/panel = ExtResource("1_jbbe6") +TabContainer/styles/panel = ExtResource("1_jbbe6") +TabContainer/styles/tab_focus = SubResource("StyleBoxEmpty_n8c5w") +TabContainer/styles/tab_hovered = ExtResource("3_vutoc") +TabContainer/styles/tab_selected = ExtResource("3_eh5tl") +TabContainer/styles/tab_unselected = ExtResource("3_m6qhe")