From 66a5719e10244f82579ce454d0755ea8ae8e3242 Mon Sep 17 00:00:00 2001 From: GreemDev Date: Sun, 12 Oct 2025 21:40:28 -0500 Subject: [PATCH] UI: Move IgnoreControllerApplet to the System config section object --- .../Configuration/ConfigurationState.cs | 19 ++++++++++--------- src/Ryujinx/Headless/Options.cs | 2 +- src/Ryujinx/UI/Applet/AvaHostUIHandler.cs | 2 +- .../UI/ViewModels/SettingsViewModel.cs | 4 ++-- 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/Ryujinx.UI.Common/Configuration/ConfigurationState.cs b/src/Ryujinx.UI.Common/Configuration/ConfigurationState.cs index 882448a70..c3d4371e9 100644 --- a/src/Ryujinx.UI.Common/Configuration/ConfigurationState.cs +++ b/src/Ryujinx.UI.Common/Configuration/ConfigurationState.cs @@ -390,6 +390,11 @@ namespace Ryujinx.UI.Common.Configuration /// public ReactiveObject IgnoreMissingServices { get; private set; } + /// + /// Ignore Controller Applet + /// + public ReactiveObject IgnoreControllerApplet { get; private set; } + /// /// Skip User Profiles Manager /// @@ -438,6 +443,8 @@ namespace Ryujinx.UI.Common.Configuration DramSize.Event += static (_, e) => LogValueChange(e, nameof(DramSize)); IgnoreMissingServices = new ReactiveObject(); IgnoreMissingServices.Event += static (_, e) => LogValueChange(e, nameof(IgnoreMissingServices)); + IgnoreControllerApplet = new ReactiveObject(); + IgnoreControllerApplet.Event += static (_, e) => LogValueChange(e, nameof(IgnoreControllerApplet)); SkipUserProfilesManager = new ReactiveObject(); SkipUserProfilesManager.Event += static (_, e) => LogValueChange(e, nameof(SkipUserProfilesManager)); AudioVolume = new ReactiveObject(); @@ -748,11 +755,6 @@ namespace Ryujinx.UI.Common.Configuration /// public ReactiveObject ShowConfirmExit { get; private set; } - /// - /// Ignore Controller Applet - /// - public ReactiveObject IgnoreControllerApplet { get; private set; } - /// /// Enables or disables save window size, position and state on close. /// @@ -780,7 +782,6 @@ namespace Ryujinx.UI.Common.Configuration EnableDiscordIntegration = new ReactiveObject(); CheckUpdatesOnStart = new ReactiveObject(); ShowConfirmExit = new ReactiveObject(); - IgnoreControllerApplet = new ReactiveObject(); RememberWindowState = new ReactiveObject(); EnableHardwareAcceleration = new ReactiveObject(); HideCursor = new ReactiveObject(); @@ -820,7 +821,6 @@ namespace Ryujinx.UI.Common.Configuration EnableDiscordIntegration = EnableDiscordIntegration, CheckUpdatesOnStart = CheckUpdatesOnStart, ShowConfirmExit = ShowConfirmExit, - IgnoreApplet = IgnoreControllerApplet, RememberWindowState = RememberWindowState, EnableHardwareAcceleration = EnableHardwareAcceleration, HideCursor = HideCursor, @@ -842,6 +842,7 @@ namespace Ryujinx.UI.Common.Configuration MemoryManagerMode = System.MemoryManagerMode, DramSize = System.DramSize, IgnoreMissingServices = System.IgnoreMissingServices, + IgnoreApplet = System.IgnoreControllerApplet, SkipUserProfiles = System.SkipUserProfilesManager, UseHypervisor = System.UseHypervisor, GuiColumns = new GuiColumns @@ -944,7 +945,6 @@ namespace Ryujinx.UI.Common.Configuration EnableDiscordIntegration.Value = true; CheckUpdatesOnStart.Value = true; ShowConfirmExit.Value = true; - IgnoreControllerApplet.Value = false; RememberWindowState.Value = true; EnableHardwareAcceleration.Value = true; HideCursor.Value = HideCursorMode.OnIdle; @@ -967,6 +967,7 @@ namespace Ryujinx.UI.Common.Configuration System.MemoryManagerMode.Value = MemoryManagerMode.HostMappedUnsafe; System.DramSize.Value = MemoryConfiguration.MemoryConfiguration4GiB; System.IgnoreMissingServices.Value = false; + System.IgnoreControllerApplet.Value = false; System.SkipUserProfilesManager.Value = false; System.UseHypervisor.Value = true; Multiplayer.LanInterfaceId.Value = "0"; @@ -1785,7 +1786,6 @@ namespace Ryujinx.UI.Common.Configuration EnableDiscordIntegration.Value = configurationFileFormat.EnableDiscordIntegration; CheckUpdatesOnStart.Value = configurationFileFormat.CheckUpdatesOnStart; ShowConfirmExit.Value = configurationFileFormat.ShowConfirmExit; - IgnoreControllerApplet.Value = configurationFileFormat.IgnoreApplet; RememberWindowState.Value = configurationFileFormat.RememberWindowState; EnableHardwareAcceleration.Value = configurationFileFormat.EnableHardwareAcceleration; HideCursor.Value = configurationFileFormat.HideCursor; @@ -1807,6 +1807,7 @@ namespace Ryujinx.UI.Common.Configuration System.MemoryManagerMode.Value = configurationFileFormat.MemoryManagerMode; System.DramSize.Value = configurationFileFormat.DramSize; System.IgnoreMissingServices.Value = configurationFileFormat.IgnoreMissingServices; + System.IgnoreControllerApplet.Value = configurationFileFormat.IgnoreApplet; System.SkipUserProfilesManager.Value = configurationFileFormat.SkipUserProfiles; System.UseHypervisor.Value = configurationFileFormat.UseHypervisor; UI.GuiColumns.FavColumn.Value = configurationFileFormat.GuiColumns.FavColumn; diff --git a/src/Ryujinx/Headless/Options.cs b/src/Ryujinx/Headless/Options.cs index 07d695a55..fc378f7aa 100644 --- a/src/Ryujinx/Headless/Options.cs +++ b/src/Ryujinx/Headless/Options.cs @@ -145,7 +145,7 @@ namespace Ryujinx.Headless IgnoreMissingServices = configurationState.System.IgnoreMissingServices; if (NeedsOverride(nameof(IgnoreControllerApplet))) - IgnoreControllerApplet = configurationState.IgnoreControllerApplet; + IgnoreControllerApplet = configurationState.System.IgnoreControllerApplet; if (NeedsOverride(nameof(SkipUserProfilesManager))) SkipUserProfilesManager = configurationState.System.SkipUserProfilesManager; diff --git a/src/Ryujinx/UI/Applet/AvaHostUIHandler.cs b/src/Ryujinx/UI/Applet/AvaHostUIHandler.cs index 05207c820..c13a85d1a 100644 --- a/src/Ryujinx/UI/Applet/AvaHostUIHandler.cs +++ b/src/Ryujinx/UI/Applet/AvaHostUIHandler.cs @@ -33,7 +33,7 @@ namespace Ryujinx.Ava.UI.Applet { ManualResetEvent dialogCloseEvent = new(false); - bool ignoreControllerApplet = ConfigurationState.Instance.IgnoreControllerApplet; + bool ignoreControllerApplet = ConfigurationState.Instance.System.IgnoreControllerApplet; bool okPressed = false; if (ignoreControllerApplet) diff --git a/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs b/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs index 6bb867ab4..33a159254 100644 --- a/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs +++ b/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs @@ -585,7 +585,6 @@ namespace Ryujinx.Ava.UI.ViewModels EnableDiscordIntegration = config.EnableDiscordIntegration; CheckUpdatesOnStart = config.CheckUpdatesOnStart; ShowConfirmExit = config.ShowConfirmExit; - IgnoreApplet = config.IgnoreControllerApplet; RememberWindowState = config.RememberWindowState; HideCursor = (int)config.HideCursor.Value; @@ -630,6 +629,7 @@ namespace Ryujinx.Ava.UI.ViewModels EnableFsIntegrityChecks = config.System.EnableFsIntegrityChecks; DramSize = config.System.DramSize; IgnoreMissingServices = config.System.IgnoreMissingServices; + IgnoreApplet = config.System.IgnoreControllerApplet; SkipUserProfiles = config.System.SkipUserProfilesManager; // CPU @@ -697,7 +697,6 @@ namespace Ryujinx.Ava.UI.ViewModels config.EnableDiscordIntegration.Value = EnableDiscordIntegration; config.CheckUpdatesOnStart.Value = CheckUpdatesOnStart; config.ShowConfirmExit.Value = ShowConfirmExit; - config.IgnoreControllerApplet.Value = IgnoreApplet; config.RememberWindowState.Value = RememberWindowState; config.HideCursor.Value = (HideCursorMode)HideCursor; @@ -746,6 +745,7 @@ namespace Ryujinx.Ava.UI.ViewModels config.System.EnableFsIntegrityChecks.Value = EnableFsIntegrityChecks; config.System.DramSize.Value = DramSize; config.System.IgnoreMissingServices.Value = IgnoreMissingServices; + config.System.IgnoreControllerApplet.Value = IgnoreApplet; config.System.SkipUserProfilesManager.Value = SkipUserProfiles; // CPU