From 4a7909b4852dbe676f363e676c1e5f9dd6694657 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20Trzci=C5=84ski?= Date: Sun, 4 Dec 2022 20:51:21 +0100 Subject: [PATCH] Use `SteamControllerConfigsMode.Overwrite` for controller configs --- SteamController/Managers/SteamConfigsManager.cs | 2 +- SteamController/Profiles/SteamProfile.cs | 2 +- SteamController/Settings.cs | 15 ++++++++++----- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/SteamController/Managers/SteamConfigsManager.cs b/SteamController/Managers/SteamConfigsManager.cs index 5083c19..dc0420d 100644 --- a/SteamController/Managers/SteamConfigsManager.cs +++ b/SteamController/Managers/SteamConfigsManager.cs @@ -28,7 +28,7 @@ namespace SteamController.Managers private bool IsActive { - get { return Settings.Default.ManageSteamControllerConfigs && Settings.Default.EnableSteamDetection; } + get { return Settings.Default.SteamControllerConfigs == Settings.SteamControllerConfigsMode.Overwrite && Settings.Default.EnableSteamDetection; } } public override void Dispose() diff --git a/SteamController/Profiles/SteamProfile.cs b/SteamController/Profiles/SteamProfile.cs index e325d86..98be571 100644 --- a/SteamController/Profiles/SteamProfile.cs +++ b/SteamController/Profiles/SteamProfile.cs @@ -10,7 +10,7 @@ namespace SteamController.Profiles public override bool Selected(Context context) { - return context.Enabled && context.State.SteamUsesSteamInput && !Settings.Default.ManageSteamControllerConfigs; + return context.Enabled && context.State.SteamUsesSteamInput && Settings.Default.SteamControllerConfigs != Settings.SteamControllerConfigsMode.Overwrite; } public override Status Run(Context context) diff --git a/SteamController/Settings.cs b/SteamController/Settings.cs index 1e0691a..33e28f0 100644 --- a/SteamController/Settings.cs +++ b/SteamController/Settings.cs @@ -52,6 +52,12 @@ namespace SteamController set { this["ScrollDirection"] = value; } } + public enum SteamControllerConfigsMode + { + DoNotTouch, + Overwrite + } + #if DEBUG [UserScopedSetting] [BrowsableAttribute(true)] @@ -59,13 +65,12 @@ namespace SteamController [ApplicationScopedSetting] [BrowsableAttribute(false)] #endif - [DefaultSettingValue("False")] - [DisplayName("Manage Steam Controller Configs")] + [DefaultSettingValue("DoNotTouch")] [Description("This does replace Steam configuration for controllers to prevent double inputs")] - public bool ManageSteamControllerConfigs + public SteamControllerConfigsMode SteamControllerConfigs { - get { return ((bool)(this["ManageSteamControllerConfigs"])); } - set { this["ManageSteamControllerConfigs"] = value; } + get { return ((SteamControllerConfigsMode)(this["SteamControllerConfigs"])); } + set { this["SteamControllerConfigs"] = value; } } public override string ToString()