diff --git a/UI/Controls/users.gd b/UI/Controls/users.gd index e1482d71..8dde653a 100644 --- a/UI/Controls/users.gd +++ b/UI/Controls/users.gd @@ -8,15 +8,15 @@ func _ready() -> void: %SearchTwitchUser.users_updated.connect(%UserList.update_list) %UserList.populate_list() %UserList.user_selected.connect(_handle_user_selected) - set_tab_names() - -func set_tab_names() -> void: - for pnl in %Tabs.get_children(): - var title := pnl.name.trim_prefix("Internal").capitalize() - %Tabs.set_tab_title(pnl.get_index(), title) - + %Clear.pressed.connect(_handle_clear) func _handle_user_selected(user: Chatter) -> void: itu.chatter = user iul.chatter = user %Tabs.current_tab = 0 + %SearchTwitchUser.hide() + +func _handle_clear() -> void: + itu.chatter = null + iul.chatter = null + %SearchTwitchUser.show() diff --git a/UI/Controls/users.tscn b/UI/Controls/users.tscn index b4a59e06..c5caa5c6 100644 --- a/UI/Controls/users.tscn +++ b/UI/Controls/users.tscn @@ -5,6 +5,7 @@ [ext_resource type="PackedScene" uid="uid://2ifvkmqd0q3i" path="res://UI/Controls/search_twitch_user.tscn" id="2_hl8i0"] [ext_resource type="PackedScene" uid="uid://d3fhwrt28r08x" path="res://UI/Controls/internal_twitch_user_info.tscn" id="4_jqw2j"] [ext_resource type="PackedScene" uid="uid://bipoye4ww4ua6" path="res://UI/Controls/internal_user_live.tscn" id="5_8sme5"] +[ext_resource type="Texture2D" uid="uid://4juherhkw8hp" path="res://addons/script_splitter/assets/Close.svg" id="6_oms12"] [node name="Users" type="PanelContainer" unique_id=823449222] anchors_preset = 15 @@ -12,6 +13,7 @@ anchor_right = 1.0 anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 +theme_type_variation = &"TabPanel" script = ExtResource("1_8sme5") metadata/_tab_index = 1 @@ -33,21 +35,41 @@ layout_mode = 2 [node name="SearchTwitchUser" parent="HSplitContainer/UserManager/VBoxContainer" unique_id=83637811 instance=ExtResource("2_hl8i0")] unique_name_in_owner = true layout_mode = 2 +theme_type_variation = &"TabPanel" [node name="HSeparator" type="HSeparator" parent="HSplitContainer/UserManager/VBoxContainer" unique_id=195418375] layout_mode = 2 -[node name="Tabs" type="TabContainer" parent="HSplitContainer/UserManager/VBoxContainer" unique_id=140135258] +[node name="MarginContainer" type="MarginContainer" parent="HSplitContainer/UserManager/VBoxContainer" unique_id=408900267] +layout_mode = 2 +size_flags_vertical = 3 +theme_override_constants/margin_left = 10 +theme_override_constants/margin_right = 10 + +[node name="Tabs" type="TabContainer" parent="HSplitContainer/UserManager/VBoxContainer/MarginContainer" unique_id=140135258] unique_name_in_owner = true custom_minimum_size = Vector2(0, 300) layout_mode = 2 +size_flags_vertical = 3 current_tab = 0 +tab_0/title = "Twitch User Info" +tab_1/title = "User Live" -[node name="InternalTwitchUserInfo" parent="HSplitContainer/UserManager/VBoxContainer/Tabs" unique_id=1986869556 instance=ExtResource("4_jqw2j")] +[node name="InternalTwitchUserInfo" parent="HSplitContainer/UserManager/VBoxContainer/MarginContainer/Tabs" unique_id=1986869556 instance=ExtResource("4_jqw2j")] unique_name_in_owner = true layout_mode = 2 +theme_type_variation = &"" +metadata/_tab_name = "Twitch User Info" -[node name="InternalUserLive" parent="HSplitContainer/UserManager/VBoxContainer/Tabs" unique_id=17956466 instance=ExtResource("5_8sme5")] +[node name="InternalUserLive" parent="HSplitContainer/UserManager/VBoxContainer/MarginContainer/Tabs" unique_id=17956466 instance=ExtResource("5_8sme5")] unique_name_in_owner = true visible = false layout_mode = 2 +metadata/_tab_name = "User Live" + +[node name="Clear" type="Button" parent="HSplitContainer/UserManager/VBoxContainer/MarginContainer" unique_id=624044174] +unique_name_in_owner = true +layout_mode = 2 +size_flags_horizontal = 8 +size_flags_vertical = 0 +icon = ExtResource("6_oms12")