From e5f95e6930ef9b94bbe2f857a8930c5bf8df08f8 Mon Sep 17 00:00:00 2001
From: Kristofers Solo <kristians.cagulis@gmail.com>
Date: Thu, 18 Nov 2021 02:12:30 +0200
Subject: [PATCH] Added 'confirm' as 'enter' button

---
 project.godot                                               | 6 ++++++
 .../server_handlers/network_processors/network_setup.gd     | 2 ++
 .../network_processors/singleplayer_setup.gd                | 4 +++-
 source/assets/scripts/ui_element_handlers/simple_prompt.gd  | 5 +++++
 source/scenes/GUI/network_setup.tscn                        | 4 ++--
 source/scenes/GUI/singleplayer_setup.tscn                   | 4 ++--
 6 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/project.godot b/project.godot
index d7b7d0b..e9b86d8 100644
--- a/project.godot
+++ b/project.godot
@@ -121,6 +121,12 @@ fullscreen_toggle={
 "events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777254,"unicode":0,"echo":false,"script":null)
  ]
 }
+enter={
+"deadzone": 0.5,
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777221,"unicode":0,"echo":false,"script":null)
+, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777222,"unicode":0,"echo":false,"script":null)
+ ]
+}
 
 [physics]
 
diff --git a/source/assets/scripts/server_handlers/network_processors/network_setup.gd b/source/assets/scripts/server_handlers/network_processors/network_setup.gd
index 81b3541..685fc0d 100644
--- a/source/assets/scripts/server_handlers/network_processors/network_setup.gd
+++ b/source/assets/scripts/server_handlers/network_processors/network_setup.gd
@@ -65,6 +65,8 @@ func _process(_delta: float) -> void:
 	if Input.is_action_just_pressed("esc") and username.is_visible_in_tree():
 		username.hide()
 		controls.show()
+	if Input.is_action_just_pressed("enter") and username.is_visible_in_tree():
+		_on_confirm_pressed()
 	
 	if get_tree().network_peer != null:
 		if get_tree().get_network_connected_peers().size() >= player_amount and get_tree().is_network_server():
diff --git a/source/assets/scripts/server_handlers/network_processors/singleplayer_setup.gd b/source/assets/scripts/server_handlers/network_processors/singleplayer_setup.gd
index a52d48b..43524c8 100644
--- a/source/assets/scripts/server_handlers/network_processors/singleplayer_setup.gd
+++ b/source/assets/scripts/server_handlers/network_processors/singleplayer_setup.gd
@@ -9,9 +9,11 @@ func _ready() -> void:
 	username_text_edit.call_deferred("grab_focus")
 
 
-func _process(delta) -> void:
+func _process(_delta) -> void:
 	if Input.is_action_just_pressed("esc"):
 		get_tree().change_scene("res://source/scenes/GUI/main_menu.tscn")
+	if Input.is_action_just_pressed("enter") and username_text_edit.is_visible_in_tree():
+		_on_confirm_pressed()
 
 func _on_confirm_pressed():
 	if username_text_edit.text != "":
diff --git a/source/assets/scripts/ui_element_handlers/simple_prompt.gd b/source/assets/scripts/ui_element_handlers/simple_prompt.gd
index dc85557..1bb86d8 100644
--- a/source/assets/scripts/ui_element_handlers/simple_prompt.gd
+++ b/source/assets/scripts/ui_element_handlers/simple_prompt.gd
@@ -1,6 +1,11 @@
 extends Control
 
 
+func _process(_delta) -> void:
+	if Input.is_action_just_pressed("enter"):
+		_on_ok_pressed()
+
+
 func _on_ok_pressed():
 	get_tree().change_scene("res://source/scenes/GUI/main_menu.tscn")
 
diff --git a/source/scenes/GUI/network_setup.tscn b/source/scenes/GUI/network_setup.tscn
index e7cc22c..92b2e76 100644
--- a/source/scenes/GUI/network_setup.tscn
+++ b/source/scenes/GUI/network_setup.tscn
@@ -172,14 +172,14 @@ __meta__ = {
 "_edit_use_anchors_": false
 }
 
-[node name="enter_server_ip" type="Sprite" parent="multiplayer_configure/popup_screen"]
+[node name="enter_username" type="Sprite" parent="multiplayer_configure/popup_screen"]
 position = Vector2( 960, 465 )
 texture = ExtResource( 14 )
 __meta__ = {
 "_edit_lock_": true
 }
 
-[node name="Label" type="Label" parent="multiplayer_configure/popup_screen/enter_server_ip"]
+[node name="Label" type="Label" parent="multiplayer_configure/popup_screen/enter_username"]
 anchor_right = 1.0
 anchor_bottom = 1.0
 margin_left = -225.0
diff --git a/source/scenes/GUI/singleplayer_setup.tscn b/source/scenes/GUI/singleplayer_setup.tscn
index 2d87060..dbbdd8f 100644
--- a/source/scenes/GUI/singleplayer_setup.tscn
+++ b/source/scenes/GUI/singleplayer_setup.tscn
@@ -47,14 +47,14 @@ __meta__ = {
 "_edit_use_anchors_": false
 }
 
-[node name="enter_server_ip" type="Sprite" parent="popup_screen"]
+[node name="enter_username" type="Sprite" parent="popup_screen"]
 position = Vector2( 960, 465 )
 texture = ExtResource( 3 )
 __meta__ = {
 "_edit_lock_": true
 }
 
-[node name="Label" type="Label" parent="popup_screen/enter_server_ip"]
+[node name="Label" type="Label" parent="popup_screen/enter_username"]
 anchor_right = 1.0
 anchor_bottom = 1.0
 margin_left = -225.0