From 3bf63f1615868cb4a8625356a49eff4aed36879c Mon Sep 17 00:00:00 2001
From: Spartan322 <Megacake1234@gmail.com>
Date: Sat, 20 May 2023 04:39:37 -0400
Subject: Add revert dialog functionality to ScreenModeSelector Fix recursion
 bug caused by invalid default value in `reset_setting` Add `option_selected`
 signal to SettingOptionButton 	Allows discerning between user option
 selection and system option selection

Add `no_emit` bool defaulted to false for `SettingOptionButton.reset_setting`
Add push_error for failing to generate option as well
Generalize ResolutionRevertDialog functionality
	Using the `dialog_reverted` signal enables custom revert functionality instead
	Disables process function while not visible
	Displayed time is more correct


Add Resolution `resolution_added`, `resolution_changed`, and `window_mode_changed` signals
Add `get_resolution_name` to Resolution
Change ResolutionSelector `_sync_resolutions` to use `Resolution.resolution_added` signal
	Reduces unnecessary resolution option list rebuilds

Move Resolution display_name functionality to ResolutionSelector
	Makes it easier to denote default functionality an inline fashion

Add SettingRevertButton to automatically handle revert setting behavior

Rename VideoTab VBoxContainer/GridContainer to VideoSettingGrid
Rename VideoTab VBoxContainer to VideoSettingList
Remove `horizontal_alignment` from AutosaveIntervalLabel
---
 .../OptionMenu/SettingNodes/SettingOptionButton.gd | 14 +++++++----
 .../OptionMenu/SettingNodes/SettingRevertButton.gd | 27 ++++++++++++++++++++++
 2 files changed, 37 insertions(+), 4 deletions(-)
 create mode 100644 game/src/OptionMenu/SettingNodes/SettingRevertButton.gd

(limited to 'game/src/OptionMenu/SettingNodes')

diff --git a/game/src/OptionMenu/SettingNodes/SettingOptionButton.gd b/game/src/OptionMenu/SettingNodes/SettingOptionButton.gd
index e0b8e4c..c5a805e 100644
--- a/game/src/OptionMenu/SettingNodes/SettingOptionButton.gd
+++ b/game/src/OptionMenu/SettingNodes/SettingOptionButton.gd
@@ -1,6 +1,8 @@
 extends OptionButton
 class_name SettingOptionButton
 
+signal option_selected(index : int, by_user : bool)
+
 @export
 var section_name : String = "setting"
 
@@ -52,20 +54,24 @@ func _ready():
 	Events.Options.load_settings.connect(load_setting)
 	Events.Options.save_settings.connect(save_setting)
 	Events.Options.reset_settings.connect(reset_setting)
+	item_selected.connect(func(index : int): option_selected.emit(index, true))
 	_setup_button()
 	if not _valid_index(default_selected) or selected == -1:
-		OS.alert("Failed to generate %s %s options." % [setting_name, section_name], "%s Options Error" % section_name)
+		var msg := "Failed to generate %s %s options." % [setting_name, section_name]
+		push_error(msg)
+		OS.alert(msg, "%s Options Error" % section_name)
 		get_tree().quit()
 
 func load_setting(file : ConfigFile) -> void:
 	if file == null: return
 	_set_value_from_file(file.get_value(section_name, setting_name, _get_value_for_file(default_selected)))
-	item_selected.emit(selected)
+	option_selected.emit(selected, false)
 
 func save_setting(file : ConfigFile) -> void:
 	if file == null: return
 	file.set_value(section_name, setting_name, _get_value_for_file(selected))
 
-func reset_setting() -> void:
+func reset_setting(no_emit : bool = false) -> void:
 	selected = default_selected
-	item_selected.emit(selected)
+	if not no_emit:
+		option_selected.emit(selected, false)
diff --git a/game/src/OptionMenu/SettingNodes/SettingRevertButton.gd b/game/src/OptionMenu/SettingNodes/SettingRevertButton.gd
new file mode 100644
index 0000000..945d35b
--- /dev/null
+++ b/game/src/OptionMenu/SettingNodes/SettingRevertButton.gd
@@ -0,0 +1,27 @@
+extends SettingOptionButton
+class_name SettingRevertButton
+
+@export_group("Nodes")
+@export var revert_dialog : ResolutionRevertDialog
+
+var previous_index : int = -1
+
+func _ready():
+	super()
+	if revert_dialog != null:
+		revert_dialog.visibility_changed.connect(_on_revert_dialog_visibility_changed)
+		revert_dialog.dialog_accepted.connect(_on_accepted)
+		revert_dialog.dialog_reverted.connect(_on_reverted)
+
+func _on_revert_dialog_visibility_changed() -> void:
+	disabled = revert_dialog.visible
+	if not revert_dialog.visible:
+		previous_index = -1
+
+func _on_reverted(button : SettingRevertButton) -> void:
+	if button != self: return
+	selected = previous_index
+	option_selected.emit(selected, false)
+
+func _on_accepted(button : SettingRevertButton) -> void:
+	if button != self: return
-- 
cgit v1.2.3-56-ga3b1