From 11f1922a82e870c37a849d6ea8a5d8801a6fe692 Mon Sep 17 00:00:00 2001 From: Vova Date: Sat, 11 Jan 2025 22:20:08 +1000 Subject: [PATCH] fix specialExitEmulator -> SpecialExitEmulator, Added description to clarify function --- src/Ryujinx/AppHost.cs | 4 ++-- src/Ryujinx/Headless/Options.cs | 2 +- src/Ryujinx/UI/ViewModels/SettingsViewModel.cs | 4 ++-- .../Utilities/Configuration/ConfigurationFileFormat.cs | 2 +- .../Configuration/ConfigurationState.Migration.cs | 2 +- .../Utilities/Configuration/ConfigurationState.Model.cs | 8 +++++--- src/Ryujinx/Utilities/Configuration/ConfigurationState.cs | 4 ++-- 7 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/Ryujinx/AppHost.cs b/src/Ryujinx/AppHost.cs index d5b6cce50..c94e869d5 100644 --- a/src/Ryujinx/AppHost.cs +++ b/src/Ryujinx/AppHost.cs @@ -1212,11 +1212,11 @@ namespace Ryujinx.Ava if (NpadManager.Update(ConfigurationState.Instance.Graphics.AspectRatio.Value.ToFloat())) { - if (ConfigurationState.Instance.Hid.specialExitEmulator.Value == 1) + if (ConfigurationState.Instance.Hid.SpecialExitEmulator.Value == 1) { SpecialExit = true; // close App } - if (ConfigurationState.Instance.Hid.specialExitEmulator.Value > 0) + if (ConfigurationState.Instance.Hid.SpecialExitEmulator.Value > 0) { _isActive = false; //close game } diff --git a/src/Ryujinx/Headless/Options.cs b/src/Ryujinx/Headless/Options.cs index 62edea497..c575416be 100644 --- a/src/Ryujinx/Headless/Options.cs +++ b/src/Ryujinx/Headless/Options.cs @@ -152,7 +152,7 @@ namespace Ryujinx.Headless IgnoreControllerApplet = configurationState.IgnoreApplet; if (NeedsOverride(nameof(SpecialExit))) - SpecialExit = configurationState.Hid.specialExitEmulator; + SpecialExit = configurationState.Hid.SpecialExitEmulator; return; diff --git a/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs b/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs index e99db5d74..ad82b4d62 100644 --- a/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs +++ b/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs @@ -514,7 +514,7 @@ namespace Ryujinx.Ava.UI.ViewModels EnableDockedMode = config.System.EnableDockedMode; EnableKeyboard = config.Hid.EnableKeyboard; EnableMouse = config.Hid.EnableMouse; - EnableSpecialExit = config.Hid.specialExitEmulator.Value switch + EnableSpecialExit = config.Hid.SpecialExitEmulator.Value switch { 0 => 0, // "Hotkey 'Exit' is Disabled" 1 => 1, // "Close app. by hotkey" @@ -628,7 +628,7 @@ namespace Ryujinx.Ava.UI.ViewModels config.System.EnableDockedMode.Value = EnableDockedMode; config.Hid.EnableKeyboard.Value = EnableKeyboard; config.Hid.EnableMouse.Value = EnableMouse; - config.Hid.specialExitEmulator.Value = EnableSpecialExit switch + config.Hid.SpecialExitEmulator.Value = EnableSpecialExit switch { 0 => 0, // "Hotkey 'Exit' is Disabled", 1 => 1, // "Close app. by hotkey", diff --git a/src/Ryujinx/Utilities/Configuration/ConfigurationFileFormat.cs b/src/Ryujinx/Utilities/Configuration/ConfigurationFileFormat.cs index 9fb2169d9..ab2e36aae 100644 --- a/src/Ryujinx/Utilities/Configuration/ConfigurationFileFormat.cs +++ b/src/Ryujinx/Utilities/Configuration/ConfigurationFileFormat.cs @@ -369,7 +369,7 @@ namespace Ryujinx.Ava.Utilities.Configuration /// /// Allows you to choose from three options: do nothing, exit the application, exit the emulator /// - public int specialExitEmulator { get; set; } + public int SpecialExitEmulator { get; set; } /// /// Hotkey Keyboard Bindings diff --git a/src/Ryujinx/Utilities/Configuration/ConfigurationState.Migration.cs b/src/Ryujinx/Utilities/Configuration/ConfigurationState.Migration.cs index 2308a1508..4fb189c76 100644 --- a/src/Ryujinx/Utilities/Configuration/ConfigurationState.Migration.cs +++ b/src/Ryujinx/Utilities/Configuration/ConfigurationState.Migration.cs @@ -136,7 +136,7 @@ namespace Ryujinx.Ava.Utilities.Configuration Hid.EnableKeyboard.Value = cff.EnableKeyboard; Hid.EnableMouse.Value = cff.EnableMouse; - Hid.specialExitEmulator.Value = cff.specialExitEmulator; + Hid.SpecialExitEmulator.Value = cff.SpecialExitEmulator; Hid.Hotkeys.Value = cff.Hotkeys; Hid.InputConfig.Value = cff.InputConfig ?? []; diff --git a/src/Ryujinx/Utilities/Configuration/ConfigurationState.Model.cs b/src/Ryujinx/Utilities/Configuration/ConfigurationState.Model.cs index e19b128a6..85bede2d5 100644 --- a/src/Ryujinx/Utilities/Configuration/ConfigurationState.Model.cs +++ b/src/Ryujinx/Utilities/Configuration/ConfigurationState.Model.cs @@ -421,9 +421,11 @@ namespace Ryujinx.Ava.Utilities.Configuration public ReactiveObject EnableMouse { get; private set; } /// - /// Allows you to choose from three options: do nothing, exit the application, exit the emulator + /// Allows you to choose one of several behaviors when pressing hotkeys: + /// 0 - Do nothing, 1 - Close the emulator application, 2 - Exit the game. /// - public ReactiveObject specialExitEmulator { get; private set; } + public ReactiveObject SpecialExitEmulator { get; private set; } + /// /// Hotkey Keyboard Bindings @@ -441,7 +443,7 @@ namespace Ryujinx.Ava.Utilities.Configuration { EnableKeyboard = new ReactiveObject(); EnableMouse = new ReactiveObject(); - specialExitEmulator = new ReactiveObject(); + SpecialExitEmulator = new ReactiveObject(); Hotkeys = new ReactiveObject(); InputConfig = new ReactiveObject>(); } diff --git a/src/Ryujinx/Utilities/Configuration/ConfigurationState.cs b/src/Ryujinx/Utilities/Configuration/ConfigurationState.cs index 861dae74b..b68f97826 100644 --- a/src/Ryujinx/Utilities/Configuration/ConfigurationState.cs +++ b/src/Ryujinx/Utilities/Configuration/ConfigurationState.cs @@ -128,7 +128,7 @@ namespace Ryujinx.Ava.Utilities.Configuration ShowConsole = UI.ShowConsole, EnableKeyboard = Hid.EnableKeyboard, EnableMouse = Hid.EnableMouse, - specialExitEmulator = Hid.specialExitEmulator, + SpecialExitEmulator = Hid.SpecialExitEmulator, Hotkeys = Hid.Hotkeys, KeyboardConfig = [], ControllerConfig = [], @@ -242,7 +242,7 @@ namespace Ryujinx.Ava.Utilities.Configuration UI.WindowStartup.WindowMaximized.Value = false; Hid.EnableKeyboard.Value = false; Hid.EnableMouse.Value = false; - Hid.specialExitEmulator.Value = 0; + Hid.SpecialExitEmulator.Value = 0; Hid.Hotkeys.Value = new KeyboardHotkeys { ToggleVSyncMode = Key.F1,