From f60abab444a59c438b9dff768390fe62a284c258 Mon Sep 17 00:00:00 2001 From: leca Date: Thu, 29 Feb 2024 17:52:48 +0300 Subject: [PATCH] Added taskbar buttons functional --- scenes/HUD/menu.tscn | 32 ++++++++++++++++++-------------- scripts/TaskPanelButton.gd | 18 ++++++++++++++++++ 2 files changed, 36 insertions(+), 14 deletions(-) create mode 100644 scripts/TaskPanelButton.gd diff --git a/scenes/HUD/menu.tscn b/scenes/HUD/menu.tscn index e113402..7cb2a85 100644 --- a/scenes/HUD/menu.tscn +++ b/scenes/HUD/menu.tscn @@ -1,6 +1,7 @@ -[gd_scene load_steps=5 format=3 uid="uid://cjlgs86ey1u1o"] +[gd_scene load_steps=6 format=3 uid="uid://cjlgs86ey1u1o"] [ext_resource type="Script" path="res://scripts/ConnectButton.gd" id="1_nhpm2"] +[ext_resource type="Script" path="res://scripts/TaskPanelButton.gd" id="1_yn6yn"] [ext_resource type="Script" path="res://scripts/Nickname.gd" id="2_5xejq"] [ext_resource type="Texture2D" uid="uid://c4pah1vj0aa4x" path="res://textures/prototype-textures/Prototype_symbol_cross_32x32px.png" id="2_mk5ih"] @@ -56,8 +57,9 @@ offset_bottom = 1.56878 grow_vertical = 0 theme_override_font_sizes/font_size = 12 text = "off" +script = ExtResource("1_yn6yn") -[node name="Button_serverlist" type="Button" parent="ColorRect/buttons"] +[node name="Button_direct" type="Button" parent="ColorRect/buttons"] layout_mode = 1 anchors_preset = 2 anchor_top = 1.0 @@ -69,6 +71,7 @@ offset_bottom = 1.56878 grow_vertical = 0 theme_override_font_sizes/font_size = 12 text = "web" +script = ExtResource("1_yn6yn") [node name="Button_settings" type="Button" parent="ColorRect/buttons"] layout_mode = 1 @@ -82,8 +85,9 @@ offset_bottom = 1.56878 grow_vertical = 0 theme_override_font_sizes/font_size = 12 text = "settings" +script = ExtResource("1_yn6yn") -[node name="ConnectMenu" type="Control" parent="."] +[node name="DirectMenu" type="Control" parent="."] layout_mode = 1 anchors_preset = 8 anchor_left = 0.5 @@ -97,7 +101,7 @@ offset_bottom = 72.0 grow_horizontal = 2 grow_vertical = 2 -[node name="ColorRect" type="ColorRect" parent="ConnectMenu"] +[node name="ColorRect" type="ColorRect" parent="DirectMenu"] layout_mode = 1 anchors_preset = 8 anchor_left = 0.5 @@ -112,7 +116,7 @@ grow_horizontal = 2 grow_vertical = 2 color = Color(0.509804, 0.509804, 0.509804, 1) -[node name="ColorRect2" type="ColorRect" parent="ConnectMenu"] +[node name="ColorRect2" type="ColorRect" parent="DirectMenu"] layout_mode = 1 anchors_preset = 8 anchor_left = 0.5 @@ -127,7 +131,7 @@ grow_horizontal = 2 grow_vertical = 2 color = Color(0.439216, 0.439216, 0.439216, 1) -[node name="https" type="TextEdit" parent="ConnectMenu"] +[node name="https" type="TextEdit" parent="DirectMenu"] custom_minimum_size = Vector2(10, 0) layout_mode = 1 anchors_preset = 8 @@ -146,7 +150,7 @@ theme_override_colors/font_selected_color = Color(0, 0, 0, 1) theme_override_font_sizes/font_size = 9 text = "https://" -[node name="IP" type="TextEdit" parent="ConnectMenu"] +[node name="IP" type="TextEdit" parent="DirectMenu"] layout_mode = 2 offset_left = 2.0 offset_top = -28.0 @@ -159,7 +163,7 @@ theme_override_font_sizes/font_size = 9 text = "127.0.0.1" placeholder_text = "IP Address" -[node name="Port" type="TextEdit" parent="ConnectMenu"] +[node name="Port" type="TextEdit" parent="DirectMenu"] layout_mode = 2 offset_left = 95.0 offset_top = -28.0 @@ -171,7 +175,7 @@ text = "2390" placeholder_text = "Port " -[node name="Connect" type="Button" parent="ConnectMenu"] +[node name="Connect" type="Button" parent="DirectMenu"] layout_mode = 2 offset_left = -25.0 offset_top = 12.0 @@ -181,7 +185,7 @@ pivot_offset = Vector2(88, 24) text = "Connect" script = ExtResource("1_nhpm2") -[node name="Panel" type="Panel" parent="ConnectMenu"] +[node name="Panel" type="Panel" parent="DirectMenu"] layout_mode = 0 offset_left = 146.0 offset_top = -27.0 @@ -189,12 +193,12 @@ offset_right = 161.0 offset_bottom = -12.0 theme_override_styles/panel = SubResource("StyleBoxTexture_eqsfo") -[node name="PlayerMenu" type="Control" parent="."] +[node name="SettingsMenu" type="Control" parent="."] anchors_preset = 0 offset_right = 256.0 offset_bottom = 128.0 -[node name="Nickname" type="TextEdit" parent="PlayerMenu"] +[node name="Nickname" type="TextEdit" parent="SettingsMenu"] layout_mode = 0 offset_left = 24.0 offset_top = 56.0 @@ -202,7 +206,7 @@ offset_right = 224.0 offset_bottom = 96.0 placeholder_text = "Unnamed" -[node name="Label" type="Label" parent="PlayerMenu"] +[node name="Label" type="Label" parent="SettingsMenu"] layout_mode = 0 offset_left = 48.0 offset_top = 24.0 @@ -210,7 +214,7 @@ offset_right = 205.0 offset_bottom = 47.0 text = "Set player nickname" -[node name="Set" type="Button" parent="PlayerMenu"] +[node name="Set" type="Button" parent="SettingsMenu"] layout_mode = 0 offset_left = 104.0 offset_top = 104.0 diff --git a/scripts/TaskPanelButton.gd b/scripts/TaskPanelButton.gd new file mode 100644 index 0000000..4bf3ece --- /dev/null +++ b/scripts/TaskPanelButton.gd @@ -0,0 +1,18 @@ +extends Button + +@onready var button = $"." +@onready var direct_menu = $"../../../DirectMenu" +@onready var settings_menu = $"../../../SettingsMenu" + +func _ready(): + button.pressed.connect(self._button_pressed) + +func _button_pressed(): + if ("quit" in name): + get_tree().quit() + elif ("direct" in name): + settings_menu.visible = false + direct_menu.visible = true + elif("settings" in name): + settings_menu.visible = true + direct_menu.visible = false