Fix popup issues regarding embedded popups and closing

Author: rsubtil

scenes/config/AboutSettings.tscn

@@ -54,7 +54,6 @@ size_flags_vertical = 3
 theme = ExtResource("15")
 
 [node name="About" type="ScrollContainer" parent="TabContainerHandler/TabContainer"]
-visible = false
 layout_mode = 2
 size_flags_horizontal = 3
 size_flags_vertical = 3
@@ -160,6 +159,7 @@ layout_mode = 2
 script = ExtResource("9")
 
 [node name="Libraries" type="ScrollContainer" parent="TabContainerHandler/TabContainer"]
+visible = false
 layout_mode = 2
 
 [node name="VBoxContainer" type="VBoxContainer" parent="TabContainerHandler/TabContainer/Libraries"]

scenes/config/settings/AddCustomInfo.gd

@@ -86,10 +86,3 @@ func tts_text(focused: Control):
 					text += node.get_child(1).text + ". "
 			return text
 	return ""
-
-func _on_close_requested():
-	hide()
-
-
-func _on_focus_exited():
-	hide()

scenes/config/settings/AddCustomInfo.tscn

@@ -4,11 +4,11 @@
 [ext_resource type="Texture2D" uid="uid://dfth5p8xpsgmy" path="res://assets/icons/success.svg" id="2"]
 [ext_resource type="Script" path="res://scenes/ui_nodes/AccessibilityFocus.gd" id="3"]
 
-[node name="AddCustomInfoPopup" type="Window"]
+[node name="AddCustomInfoPopup" type="Popup"]
 initial_position = 1
 size = Vector2i(624, 357)
-transient = true
-popup_window = true
+visible = true
+borderless = false
 script = ExtResource("1")
 
 [node name="Panel" type="Panel" parent="."]
@@ -102,8 +102,6 @@ size_flags_horizontal = 4
 size_flags_vertical = 10
 text = "Ok"
 
-[connection signal="close_requested" from="." to="." method="_on_close_requested"]
-[connection signal="focus_exited" from="." to="." method="_on_focus_exited"]
 [connection signal="text_changed" from="Panel/VBoxContainer/LineEdit" to="." method="check_text"]
 [connection signal="text_submitted" from="Panel/VBoxContainer/LineEdit" to="." method="_on_LineEdit_text_entered"]
 [connection signal="pressed" from="Panel/VBoxContainer/OK" to="." method="_on_OK_pressed"]

scenes/config/settings/AddExistingInfo.gd

@@ -48,13 +48,5 @@ func _on_OK_pressed():
 		emit_signal("identifier_picked", n_options.get_selected_metadata())
 	hide()
 
-
-func _on_AddExistingInfoPopup_popup_hide():
+func _on_popup_hide():
 	n_options.clear()
-
-func _on_close_requested():
-	hide()
-
-
-func _on_focus_exited():
-	hide()

scenes/config/settings/AddExistingInfo.tscn

@@ -3,10 +3,11 @@
 [ext_resource type="Script" path="res://scenes/config/settings/AddExistingInfo.gd" id="1"]
 [ext_resource type="Script" path="res://scenes/ui_nodes/AccessibilityFocus.gd" id="2"]
 
-[node name="AddExistingInfoPopup" type="Window"]
+[node name="AddExistingInfoPopup" type="Popup"]
+position = Vector2i(0, 36)
 size = Vector2i(528, 343)
-transient = true
-popup_window = true
+visible = true
+borderless = false
 script = ExtResource("1")
 
 [node name="Panel" type="Panel" parent="."]
@@ -49,6 +50,5 @@ size_flags_horizontal = 4
 size_flags_vertical = 8
 text = "Ok"
 
-[connection signal="close_requested" from="." to="." method="_on_close_requested"]
-[connection signal="focus_exited" from="." to="." method="_on_focus_exited"]
+[connection signal="popup_hide" from="." to="." method="_on_popup_hide"]
 [connection signal="pressed" from="Panel/VBoxContainer/OK" to="." method="_on_OK_pressed"]

scenes/config/settings/input/KeyboardRemap.gd

@@ -47,11 +47,3 @@ func _on_Timer_timeout():
 		await get_tree().process_frame
 		TTS.speak("Key was remapped to " + n_key_label.text)
 	emit_signal("key_remapped", key, oldcode, keycode)
-
-
-func _on_close_requested():
-	hide()
-
-
-func _on_focus_exited():
-	hide()

scenes/config/settings/input/KeyboardRemap.tscn

@@ -3,11 +3,11 @@
 [ext_resource type="FontFile" path="res://resources/fonts/default_italic.tres" id="1"]
 [ext_resource type="Script" path="res://scenes/config/settings/input/KeyboardRemap.gd" id="2"]
 
-[node name="KeyboardRemap" type="Window"]
+[node name="KeyboardRemap" type="Popup"]
 initial_position = 1
 size = Vector2i(283, 179)
-transient = true
-popup_window = true
+visible = true
+borderless = false
 script = ExtResource("2")
 
 [node name="Panel" type="Panel" parent="."]
@@ -55,6 +55,4 @@ unique_name_in_owner = true
 wait_time = 1.2
 one_shot = true
 
-[connection signal="close_requested" from="." to="." method="_on_close_requested"]
-[connection signal="focus_exited" from="." to="." method="_on_focus_exited"]
 [connection signal="timeout" from="Panel/Timer" to="." method="_on_Timer_timeout"]

scenes/config/settings/system/RetroArchConfig.gd

@@ -93,9 +93,3 @@ func tts_tree_item_text(item: TreeItem, tree: Tree) -> String:
 				return "Remove emulator"
 	return ""
 
-func _on_close_requested():
-	hide()
-
-
-func _on_focus_exited():
-	hide()

scenes/config/settings/system/RetroArchConfig.tscn

@@ -3,10 +3,10 @@
 [ext_resource type="Script" path="res://scenes/config/settings/system/RetroArchConfig.gd" id="1"]
 [ext_resource type="Script" path="res://scenes/ui_nodes/AccessibilityFocus.gd" id="2"]
 
-[node name="RetroArchConfig" type="Window"]
+[node name="RetroArchConfig" type="Popup"]
 size = Vector2i(584, 422)
-transient = true
-popup_window = true
+visible = true
+borderless = false
 script = ExtResource("1")
 
 [node name="Panel" type="Panel" parent="."]
@@ -79,8 +79,6 @@ size_flags_vertical = 8
 focus_neighbor_bottom = NodePath("../HBoxContainer/CoreOptions")
 text = "Ok"
 
-[connection signal="close_requested" from="." to="." method="_on_close_requested"]
-[connection signal="focus_exited" from="." to="." method="_on_focus_exited"]
 [connection signal="pressed" from="Panel/VBoxContainer/HBoxContainer/AddCore" to="." method="_on_AddCore_pressed"]
 [connection signal="item_activated" from="Panel/VBoxContainer/Cores" to="." method="_on_Cores_item_activated"]
 [connection signal="pressed" from="Panel/VBoxContainer/OK" to="." method="_on_OK_pressed"]

scenes/config/settings/system/SelectExtensionsPopup.gd

@@ -115,11 +115,3 @@ func _on_OK_pressed():
 	hide()
 	emit_signal("extensions_picked", extensions.duplicate())
 	extensions.clear()
-
-
-func _on_close_requested():
-	hide()
-
-
-func _on_focus_exited():
-	hide()