MeloNX/Ryujinx-ryubing
11
0
Fork 0
Code Issues 184 Pull Requests 15 Actions Packages Projects Releases 36 Wiki Activity

fix specialExitEmulator -> SpecialExitEmulator, Added description to clarify function

Browse Source
This commit is contained in:
Vova 2025-01-11 22:20:08 +10:00
parent de18c4927f
commit 11f1922a82
7 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Ryujinx/AppHost.cs
View File

@ -1212,11 +1212,11 @@ namespace Ryujinx.Ava
if (NpadManager.Update(ConfigurationState.Instance.Graphics.AspectRatio.Value.ToFloat())) 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 SpecialExit = true; // close App
} }
if (ConfigurationState.Instance.Hid.specialExitEmulator.Value > 0) if (ConfigurationState.Instance.Hid.SpecialExitEmulator.Value > 0)
{ {
_isActive = false; //close game _isActive = false; //close game
} }

2
src/Ryujinx/Headless/Options.cs
View File

@ -152,7 +152,7 @@ namespace Ryujinx.Headless
IgnoreControllerApplet = configurationState.IgnoreApplet; IgnoreControllerApplet = configurationState.IgnoreApplet;
if (NeedsOverride(nameof(SpecialExit))) if (NeedsOverride(nameof(SpecialExit)))
SpecialExit = configurationState.Hid.specialExitEmulator; SpecialExit = configurationState.Hid.SpecialExitEmulator;
return; return;

4
src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
View File

@ -514,7 +514,7 @@ namespace Ryujinx.Ava.UI.ViewModels
EnableDockedMode = config.System.EnableDockedMode; EnableDockedMode = config.System.EnableDockedMode;
EnableKeyboard = config.Hid.EnableKeyboard; EnableKeyboard = config.Hid.EnableKeyboard;
EnableMouse = config.Hid.EnableMouse; EnableMouse = config.Hid.EnableMouse;
EnableSpecialExit = config.Hid.specialExitEmulator.Value switch EnableSpecialExit = config.Hid.SpecialExitEmulator.Value switch
{ {
0 => 0, // "Hotkey 'Exit' is Disabled" 0 => 0, // "Hotkey 'Exit' is Disabled"
1 => 1, // "Close app. by hotkey" 1 => 1, // "Close app. by hotkey"
@ -628,7 +628,7 @@ namespace Ryujinx.Ava.UI.ViewModels
config.System.EnableDockedMode.Value = EnableDockedMode; config.System.EnableDockedMode.Value = EnableDockedMode;
config.Hid.EnableKeyboard.Value = EnableKeyboard; config.Hid.EnableKeyboard.Value = EnableKeyboard;
config.Hid.EnableMouse.Value = EnableMouse; config.Hid.EnableMouse.Value = EnableMouse;
config.Hid.specialExitEmulator.Value = EnableSpecialExit switch config.Hid.SpecialExitEmulator.Value = EnableSpecialExit switch
{ {
0 => 0, // "Hotkey 'Exit' is Disabled", 0 => 0, // "Hotkey 'Exit' is Disabled",
1 => 1, // "Close app. by hotkey", 1 => 1, // "Close app. by hotkey",

2
src/Ryujinx/Utilities/Configuration/ConfigurationFileFormat.cs
View File

@ -369,7 +369,7 @@ namespace Ryujinx.Ava.Utilities.Configuration
/// <summary> /// <summary>
/// Allows you to choose from three options: do nothing, exit the application, exit the emulator /// Allows you to choose from three options: do nothing, exit the application, exit the emulator
/// </summary> /// </summary>
public int specialExitEmulator { get; set; } public int SpecialExitEmulator { get; set; }
/// <summary> /// <summary>
/// Hotkey Keyboard Bindings /// Hotkey Keyboard Bindings

2
src/Ryujinx/Utilities/Configuration/ConfigurationState.Migration.cs
View File

@ -136,7 +136,7 @@ namespace Ryujinx.Ava.Utilities.Configuration
Hid.EnableKeyboard.Value = cff.EnableKeyboard; Hid.EnableKeyboard.Value = cff.EnableKeyboard;
Hid.EnableMouse.Value = cff.EnableMouse; Hid.EnableMouse.Value = cff.EnableMouse;
Hid.specialExitEmulator.Value = cff.specialExitEmulator; Hid.SpecialExitEmulator.Value = cff.SpecialExitEmulator;
Hid.Hotkeys.Value = cff.Hotkeys; Hid.Hotkeys.Value = cff.Hotkeys;
Hid.InputConfig.Value = cff.InputConfig ?? []; Hid.InputConfig.Value = cff.InputConfig ?? [];

8
src/Ryujinx/Utilities/Configuration/ConfigurationState.Model.cs
View File

@ -421,9 +421,11 @@ namespace Ryujinx.Ava.Utilities.Configuration
public ReactiveObject<bool> EnableMouse { get; private set; } public ReactiveObject<bool> EnableMouse { get; private set; }
/// <summary> /// <summary>
/// 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.
/// </summary> /// </summary>
public ReactiveObject<int> specialExitEmulator { get; private set; } public ReactiveObject<int> SpecialExitEmulator { get; private set; }
/// <summary> /// <summary>
/// Hotkey Keyboard Bindings /// Hotkey Keyboard Bindings
@ -441,7 +443,7 @@ namespace Ryujinx.Ava.Utilities.Configuration
{ {
EnableKeyboard = new ReactiveObject<bool>(); EnableKeyboard = new ReactiveObject<bool>();
EnableMouse = new ReactiveObject<bool>(); EnableMouse = new ReactiveObject<bool>();
specialExitEmulator = new ReactiveObject<int>(); SpecialExitEmulator = new ReactiveObject<int>();
Hotkeys = new ReactiveObject<KeyboardHotkeys>(); Hotkeys = new ReactiveObject<KeyboardHotkeys>();
InputConfig = new ReactiveObject<List<InputConfig>>(); InputConfig = new ReactiveObject<List<InputConfig>>();
} }

4
src/Ryujinx/Utilities/Configuration/ConfigurationState.cs
View File

@ -128,7 +128,7 @@ namespace Ryujinx.Ava.Utilities.Configuration
ShowConsole = UI.ShowConsole, ShowConsole = UI.ShowConsole,
EnableKeyboard = Hid.EnableKeyboard, EnableKeyboard = Hid.EnableKeyboard,
EnableMouse = Hid.EnableMouse, EnableMouse = Hid.EnableMouse,
specialExitEmulator = Hid.specialExitEmulator, SpecialExitEmulator = Hid.SpecialExitEmulator,
Hotkeys = Hid.Hotkeys, Hotkeys = Hid.Hotkeys,
KeyboardConfig = [], KeyboardConfig = [],
ControllerConfig = [], ControllerConfig = [],
@ -242,7 +242,7 @@ namespace Ryujinx.Ava.Utilities.Configuration
UI.WindowStartup.WindowMaximized.Value = false; UI.WindowStartup.WindowMaximized.Value = false;
Hid.EnableKeyboard.Value = false; Hid.EnableKeyboard.Value = false;
Hid.EnableMouse.Value = false; Hid.EnableMouse.Value = false;
Hid.specialExitEmulator.Value = 0; Hid.SpecialExitEmulator.Value = 0;
Hid.Hotkeys.Value = new KeyboardHotkeys Hid.Hotkeys.Value = new KeyboardHotkeys
{ {
ToggleVSyncMode = Key.F1, ToggleVSyncMode = Key.F1,