diff options
| author |   Spartan322 <Megacake1234@gmail.com> | 2023-05-20 10:39:37 +0200 |
|---|---|---|
| committer | Spartan322 <Megacake1234@gmail.com> | 2023-05-20 10:39:37 +0200 |
| commit | 3bf63f1615868cb4a8625356a49eff4aed36879c (patch) | |
| tree | 54d7092a3f68740e92008e073334d6beb3154a8b /game/src/OptionMenu/ScreenModeSelector.gd | |
| parent | e80966ad4d92599bd5f899dfa708d2e6d131b7e7 (diff) | |
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
Diffstat (limited to 'game/src/OptionMenu/ScreenModeSelector.gd')
| -rw-r--r-- | game/src/OptionMenu/ScreenModeSelector.gd | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/game/src/OptionMenu/ScreenModeSelector.gd b/game/src/OptionMenu/ScreenModeSelector.gd index f17fefb..af95901 100644 --- a/game/src/OptionMenu/ScreenModeSelector.gd +++ b/game/src/OptionMenu/ScreenModeSelector.gd @@ -1,4 +1,4 @@ -extends SettingOptionButton +extends SettingRevertButton # REQUIREMENTS # * UIFUN-42 @@ -31,12 +31,18 @@ func _setup_button(): default_selected = get_screen_mode_from_window_mode(get_viewport().get_window().mode) selected = default_selected -func _on_item_selected(index : int): +func _on_option_selected(index : int, by_user : bool) -> void: if _valid_index(index): - var window := get_viewport().get_window() + if by_user: + print("Start Revert Countdown!") + revert_dialog.show_dialog.call_deferred(self) + previous_index = get_screen_mode_from_window_mode(get_viewport().get_window().mode) + var current_resolution := Resolution.get_current_resolution() - window.mode = get_window_mode_from_screen_mode(index) + var window_mode := get_window_mode_from_screen_mode(index) + Resolution.window_mode_changed.emit(window_mode) + get_viewport().get_window().mode = window_mode Resolution.set_resolution(current_resolution) else: push_error("Invalid ScreenModeSelector index: %d" % index) - reset_setting() + reset_setting(not by_user) |