From 368ed5b025e28b22839ab36c93d6686f62eb3169 Mon Sep 17 00:00:00 2001 From: WallK Date: Fri, 12 Jan 2024 09:37:05 +0200 Subject: [PATCH] Added exit button --- tools/configurator/main.gd | 10 +++++++++- tools/configurator/main.tscn | 21 ++++++++++++++++++++- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/tools/configurator/main.gd b/tools/configurator/main.gd index 27ba1a84..db95e7ac 100644 --- a/tools/configurator/main.gd +++ b/tools/configurator/main.gd @@ -8,7 +8,7 @@ func _ready(): func _input(event): if event.is_action_pressed("quit"): - get_tree().quit() + _exit() func findElements(node: Node, className: String, result: Array = []) -> Array: if node.is_class(className): @@ -25,3 +25,11 @@ func _on_quickresume_advanced_pressed(): var popup = load("res://components/popup.tscn").instantiate() as Control popup.set_content("res://popup_content_test.tscn") $Background.add_child(popup) + + +func _on_exit_button_pressed(): + _exit() + +func _exit(): + get_tree().root.propagate_notification(NOTIFICATION_WM_CLOSE_REQUEST) + get_tree().quit() diff --git a/tools/configurator/main.tscn b/tools/configurator/main.tscn index 963c229d..cf28653e 100644 --- a/tools/configurator/main.tscn +++ b/tools/configurator/main.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=18 format=3 uid="uid://61f6m4r1mpan"] +[gd_scene load_steps=20 format=3 uid="uid://61f6m4r1mpan"] [ext_resource type="Texture2D" uid="uid://bv6vh33cnfaw4" path="res://icon.svg" id="1_axfei"] [ext_resource type="Script" path="res://main.gd" id="1_obpq7"] @@ -6,6 +6,7 @@ [ext_resource type="AudioStream" uid="uid://dig4pco500pyt" path="res://res/configurator.mp3" id="3_xivj6"] [ext_resource type="Texture2D" uid="uid://dx0u5hiwxfgu5" path="res://res/pixel_ui_theme/8x8_ui_elements.png" id="4_2tuu4"] [ext_resource type="Script" path="res://Rekku.gd" id="4_nqqx3"] +[ext_resource type="Texture2D" uid="uid://cxyml1owhi6de" path="res://res/pixel_ui_theme/8x8_ui_icons.png" id="4_v1scw"] [ext_resource type="Script" path="res://helper_text.gd" id="5_cprkf"] [ext_resource type="Texture2D" uid="uid://cor8ep0fkqm08" path="res://res/Rekku/base.png" id="9_brsrf"] [ext_resource type="Texture2D" uid="uid://cavtn1rljc5oe" path="res://res/Rekku/eyes-open.png" id="10_y6gkh"] @@ -15,6 +16,11 @@ [ext_resource type="Texture2D" uid="uid://kx8eypf4ffvu" path="res://res/Rekku/mouth-base.png" id="14_lnkoa"] [ext_resource type="Texture2D" uid="uid://b6gl8sltbak7v" path="res://res/Rekku/mouth-O.png" id="15_1sikj"] +[sub_resource type="AtlasTexture" id="AtlasTexture_st633"] +atlas = ExtResource("4_v1scw") +region = Rect2(72, 56, 8, 8) +margin = Rect2(1, 1, 1, 1) + [sub_resource type="StyleBoxTexture" id="StyleBoxTexture_rf0rc"] texture = ExtResource("4_2tuu4") texture_margin_left = 6.0 @@ -812,6 +818,18 @@ text = "RetroDECK v0.8.0b" scroll_active = false +[node name="Exit" type="Button" parent="Background"] +layout_mode = 1 +anchors_preset = -1 +anchor_left = 1.0 +anchor_right = 1.0 +offset_left = -33.0 +offset_top = 50.0 +offset_right = -12.0 +offset_bottom = 71.0 +grow_horizontal = 0 +icon = SubResource("AtlasTexture_st633") + [node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."] stream = ExtResource("3_xivj6") volume_db = -11.243 @@ -908,3 +926,4 @@ animation = &"speech" frame_progress = 0.664627 [connection signal="pressed" from="Background/MarginContainer/TabContainer/System/ScrollContainer/VBoxContainer/game_control_container/GridContainer/Button" to="." method="_on_quickresume_advanced_pressed"] +[connection signal="pressed" from="Background/Exit" to="." method="_on_exit_button_pressed"]