From 8e8055656679111eb2eedef75bcb877def12408a Mon Sep 17 00:00:00 2001
From: DarkiRuiz <josemarujmr@gmail.com>
Date: Sun, 23 Jun 2024 20:51:49 +0200
Subject: [PATCH 1/2] Add Steam Desktop profile overwrite toggle in settings
 menu

---
 HandheldCompanion/App.config                  |  3 ++
 .../Hints/Hint_SteamNeptuneDesktop.cs         | 33 ++++++++++++-
 HandheldCompanion/Platforms/Steam.cs          | 48 +++++++++++++++++--
 .../Properties/Resources.Designer.cs          | 45 +++++++++++++++++
 HandheldCompanion/Properties/Resources.resx   | 15 ++++++
 .../Properties/Settings.Designer.cs           | 24 +++++++---
 .../Properties/Settings.settings              |  3 ++
 .../Views/Pages/SettingsPage.xaml             | 38 +++++++++++++++
 .../Views/Pages/SettingsPage.xaml.cs          | 11 +++++
 9 files changed, 207 insertions(+), 13 deletions(-)

diff --git a/HandheldCompanion/App.config b/HandheldCompanion/App.config
index 2269c726b..62976d0ed 100644
--- a/HandheldCompanion/App.config
+++ b/HandheldCompanion/App.config
@@ -278,6 +278,9 @@
    <setting name="LegionBatteryChargeLimit" serializeAs="String">
     <value>False</value>
    </setting>
+   <setting name="OverrideSteamProfileOnStart" serializeAs="String">
+    <value>True</value>
+   </setting>
   </HandheldCompanion.Properties.Settings>
 	</userSettings>
 </configuration>
\ No newline at end of file
diff --git a/HandheldCompanion/Controls/Hints/Hint_SteamNeptuneDesktop.cs b/HandheldCompanion/Controls/Hints/Hint_SteamNeptuneDesktop.cs
index a163d929c..10ea0ee38 100644
--- a/HandheldCompanion/Controls/Hints/Hint_SteamNeptuneDesktop.cs
+++ b/HandheldCompanion/Controls/Hints/Hint_SteamNeptuneDesktop.cs
@@ -12,6 +12,7 @@ public Hint_SteamNeptuneDesktop() : base()
         {
             PlatformManager.Steam.Updated += Steam_Updated;
             PlatformManager.Initialized += PlatformManager_Initialized;
+            SettingsManager.SettingValueChanged += SettingsManager_SettingValueChanged;
 
             // default state
             this.HintActionButton.Visibility = Visibility.Visible;
@@ -24,7 +25,8 @@ public Hint_SteamNeptuneDesktop() : base()
         }
 
         private void Steam_Updated(PlatformStatus status)
-        {
+        {            
+            bool OverrideSteamProfileOnStart = SettingsManager.GetBoolean("OverrideSteamProfileOnStart");
             bool DesktopProfileApplied = PlatformManager.Steam.HasDesktopProfileApplied();
 
             // UI thread (async)
@@ -38,7 +40,24 @@ private void Steam_Updated(PlatformStatus status)
                         this.Visibility = Visibility.Collapsed;
                         break;
                     case PlatformStatus.Started:
-                        this.Visibility = DesktopProfileApplied ? Visibility.Visible : Visibility.Collapsed;
+
+                        if (OverrideSteamProfileOnStart)
+                        {
+                            this.HintTitle.Text = Properties.Resources.Hint_SteamNeptuneDesktop;
+                            this.HintDescription.Text = Properties.Resources.Hint_SteamNeptuneDesktopDesc;
+                            this.HintReadMe.Text = Properties.Resources.Hint_SteamNeptuneReadme;
+
+                            this.Visibility = DesktopProfileApplied ? Visibility.Visible : Visibility.Collapsed;
+                        }
+                        else
+                        {
+                            this.HintTitle.Text = Properties.Resources.Hint_SteamNeptuneDesktopOverridden;
+                            this.HintDescription.Text = Properties.Resources.Hint_SteamNeptuneDesktopOverriddenDesc;
+                            this.HintReadMe.Text = Properties.Resources.Hint_SteamNeptuneReadmeOverridden;
+
+                            this.Visibility = !DesktopProfileApplied ? Visibility.Visible : Visibility.Collapsed;
+                        }
+
                         break;
                 }
             });
@@ -49,6 +68,16 @@ private void PlatformManager_Initialized()
             Steam_Updated(PlatformManager.Steam.Status);
         }
 
+        private void SettingsManager_SettingValueChanged(string name, object value)
+        {
+            switch (name)
+            {
+                case "OverrideSteamProfileOnStart":
+                    Steam_Updated(PlatformManager.Steam.Status);
+                    break;
+            }
+        }
+
         protected override void HintActionButton_Click(object sender, RoutedEventArgs e)
         {
             Task.Run(async () =>
diff --git a/HandheldCompanion/Platforms/Steam.cs b/HandheldCompanion/Platforms/Steam.cs
index 2233f2b6c..390858d2c 100644
--- a/HandheldCompanion/Platforms/Steam.cs
+++ b/HandheldCompanion/Platforms/Steam.cs
@@ -78,16 +78,24 @@ public override bool Stop(bool kill = false)
     {
         ProcessManager.ProcessStarted -= ProcessManager_ProcessStarted;
 
-        // restore files even if Steam is still running
-        RestoreFiles();
+        if (HasDesktopProfileApplied())
+        {
+            // restore files even if Steam is still running
+            RestoreFiles();
+        }
 
         return base.Stop();
     }
 
     protected override void Process_Exited(object? sender, EventArgs e)
     {
-        LogManager.LogDebug("Steam stopped, restoring files");
-        RestoreFiles();
+        SettingsManager.SettingValueChanged -= SettingsManager_SettingValueChanged;
+
+        if (HasDesktopProfileApplied())
+        {
+            LogManager.LogDebug("Steam stopped, restoring files");
+            RestoreFiles();
+        }
     }
 
     public bool HasXboxDriversInstalled()
@@ -140,7 +148,14 @@ private async void ProcessManager_ProcessStarted(ProcessEx processEx, bool OnSta
         if (!OnStartup && processEx.Executable == RunningName)
         {
             await Task.Delay(3000);
-            ReplaceFiles();
+
+            // Overwrite files only if setting is enabled.
+            if (SettingsManager.GetBoolean("OverrideSteamProfileOnStart"))
+            {
+                ReplaceFiles();
+            }
+
+            SettingsManager.SettingValueChanged += SettingsManager_SettingValueChanged;
 
             // hook into current process
             if (Process is not null && !Process.HasExited)
@@ -148,6 +163,29 @@ private async void ProcessManager_ProcessStarted(ProcessEx processEx, bool OnSta
         }
     }
 
+    private void SettingsManager_SettingValueChanged(string name, object value)
+    {
+        switch (name)
+        {
+            case "OverrideSteamProfileOnStart":
+
+                if (Convert.ToBoolean(value))
+                {
+                    if (HasDesktopProfileApplied())
+                    {
+                        // Steam profile applied, overwrite enabled
+                        ReplaceFiles();
+                    }
+                }
+                else if (!HasDesktopProfileApplied())
+                {
+                    // Steam profile overwritten, overwrite disabled
+                    RestoreFiles();
+                }
+                break;
+        }
+    }
+
     public HashSet<string>? GetControllerBlacklist()
     {
         try
diff --git a/HandheldCompanion/Properties/Resources.Designer.cs b/HandheldCompanion/Properties/Resources.Designer.cs
index 19407c330..f852baa8d 100644
--- a/HandheldCompanion/Properties/Resources.Designer.cs
+++ b/HandheldCompanion/Properties/Resources.Designer.cs
@@ -3743,6 +3743,24 @@ public static string Hint_SteamNeptuneDesktopDesc {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Steam Desktop Layout is overwritten.
+        /// </summary>
+        public static string Hint_SteamNeptuneDesktopOverridden {
+            get {
+                return ResourceManager.GetString("Hint_SteamNeptuneDesktopOverridden", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Steam is already running and Steam Desktop Layout is overwritten by Handheld Companion, but this setting was disabled by the user.
+        /// </summary>
+        public static string Hint_SteamNeptuneDesktopOverriddenDesc {
+            get {
+                return ResourceManager.GetString("Hint_SteamNeptuneDesktopOverriddenDesc", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to You should restart Steam, so that Handheld Companion can automatically adjust Steam Desktop Layout and prevent double input.
         /// </summary>
@@ -3752,6 +3770,15 @@ public static string Hint_SteamNeptuneReadme {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to You should restart Steam, so that Steam Desktop Layout can be reset to defaults.
+        /// </summary>
+        public static string Hint_SteamNeptuneReadmeOverridden {
+            get {
+                return ResourceManager.GetString("Hint_SteamNeptuneReadmeOverridden", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Steam Xbox Controller Enhanced Features Driver is installed.
         /// </summary>
@@ -8147,6 +8174,24 @@ public static string SettingsPage_OpenAppBackgroundDesc {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Override Steam profiles at startup.
+        /// </summary>
+        public static string SettingsPage_OverrideSteamProfileOnStart {
+            get {
+                return ResourceManager.GetString("SettingsPage_OverrideSteamProfileOnStart", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Default Steam desktop and chord input profiles will be swapped for empty ones on application start.
+        /// </summary>
+        public static string SettingsPage_OverrideSteamProfileOnStartDesc {
+            get {
+                return ResourceManager.GetString("SettingsPage_OverrideSteamProfileOnStartDesc", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Quicktools backdrop, none, mica, tabbed, acrylic.
         /// </summary>
diff --git a/HandheldCompanion/Properties/Resources.resx b/HandheldCompanion/Properties/Resources.resx
index 65e086a98..6eca297dd 100644
--- a/HandheldCompanion/Properties/Resources.resx
+++ b/HandheldCompanion/Properties/Resources.resx
@@ -3012,4 +3012,19 @@ Motion input toggle: press selected button(s) to switch motion state.</value>
   <data name="DevicePage_LegionBatteryChargeLimit_Desc" xml:space="preserve">
     <value>Sets the maximum charge level of the battery to 80%</value>
   </data>
+  <data name="SettingsPage_OverrideSteamProfileOnStart" xml:space="preserve">
+    <value>Override Steam profiles at startup</value>
+  </data>
+  <data name="SettingsPage_OverrideSteamProfileOnStartDesc" xml:space="preserve">
+    <value>Default Steam desktop and chord input profiles will be swapped for empty ones on application start</value>
+  </data>
+  <data name="Hint_SteamNeptuneDesktopOverridden" xml:space="preserve">
+    <value>Steam Desktop Layout is overwritten</value>
+  </data>
+  <data name="Hint_SteamNeptuneDesktopOverriddenDesc" xml:space="preserve">
+    <value>Steam is already running and Steam Desktop Layout is overwritten by Handheld Companion, but this setting was disabled by the user</value>
+  </data>
+  <data name="Hint_SteamNeptuneReadmeOverridden" xml:space="preserve">
+    <value>You should restart Steam, so that Steam Desktop Layout can be reset to defaults</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/HandheldCompanion/Properties/Settings.Designer.cs b/HandheldCompanion/Properties/Settings.Designer.cs
index 426c698bf..f6cf74a42 100644
--- a/HandheldCompanion/Properties/Settings.Designer.cs
+++ b/HandheldCompanion/Properties/Settings.Designer.cs
@@ -1,4 +1,4 @@
-//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
 //     Runtime Version:4.0.30319.42000
@@ -11,13 +11,13 @@
 
 namespace HandheldCompanion.Properties
 {
-
-
+    
+    
     [SettingsProvider(typeof(CustomSettingsProvider))]
     internal sealed partial class Settings : ApplicationSettingsBase
     {
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-
+        
         public static Settings Default
         {
             get
@@ -25,7 +25,7 @@ public static Settings Default
                 return defaultInstance;
             }
         }
-
+        
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("False")]
@@ -1103,7 +1103,7 @@ public int LegionControllerGyroIndex {
                 this["LegionControllerGyroIndex"] = value;
             }
         }
-
+        
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("False")]
@@ -1118,5 +1118,17 @@ public bool LegionBatteryChargeLimit
                 this["LegionBatteryChargeLimit"] = value;
             }
         }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("True")]
+        public bool OverrideSteamProfileOnStart {
+            get {
+                return ((bool)(this["OverrideSteamProfileOnStart"]));
+            }
+            set {
+                this["OverrideSteamProfileOnStart"] = value;
+            }
+        }
     }
 }
diff --git a/HandheldCompanion/Properties/Settings.settings b/HandheldCompanion/Properties/Settings.settings
index 97b03d5e1..2ce453eb5 100644
--- a/HandheldCompanion/Properties/Settings.settings
+++ b/HandheldCompanion/Properties/Settings.settings
@@ -275,5 +275,8 @@
     <Setting Name="LegionBatteryChargeLimit" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
+    <Setting Name="OverrideSteamProfileOnStart" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">True</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
\ No newline at end of file
diff --git a/HandheldCompanion/Views/Pages/SettingsPage.xaml b/HandheldCompanion/Views/Pages/SettingsPage.xaml
index b543e80b0..0306da8ab 100644
--- a/HandheldCompanion/Views/Pages/SettingsPage.xaml
+++ b/HandheldCompanion/Views/Pages/SettingsPage.xaml
@@ -249,6 +249,44 @@
                     </Grid>
                 </Border>
 
+                <!--  Override default Steam desktop and chord profiles on start   -->
+                <Border
+                    Padding="15,12,12,12"
+                    Background="{DynamicResource ExpanderHeaderBackground}"
+                    CornerRadius="{DynamicResource ControlCornerRadius}">
+
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="5*" MinWidth="200" />
+                            <ColumnDefinition Width="5*" MinWidth="200" />
+                        </Grid.ColumnDefinitions>
+
+                        <DockPanel>
+                            <ui:FontIcon
+                                Height="40"
+                                HorizontalAlignment="Center"
+                                FontFamily="{DynamicResource SymbolThemeFontFamily}"
+                                Glyph="&#xEA6C;" />
+
+                            <ui:SimpleStackPanel Margin="12,0,0,0" VerticalAlignment="Center">
+                                <TextBlock Style="{StaticResource BodyTextBlockStyle}" Text="{l:Static resx:Resources.SettingsPage_OverrideSteamProfileOnStart}" />
+                                <TextBlock
+                                    Foreground="{DynamicResource SystemControlForegroundBaseMediumBrush}"
+                                    Style="{StaticResource CaptionTextBlockStyle}"
+                                    Text="{l:Static resx:Resources.SettingsPage_OverrideSteamProfileOnStartDesc}"
+                                    TextWrapping="Wrap" />
+                            </ui:SimpleStackPanel>
+                        </DockPanel>
+
+                        <ui:ToggleSwitch
+                            Name="Toggle_OverrideSteamProfileOnStart"
+                            Grid.Column="1"
+                            HorizontalAlignment="Right"
+                            Style="{DynamicResource InvertedToggleSwitchStyle}"
+                            Toggled="Toggle_OverrideSteamProfileOnStart_Toggled" />
+                    </Grid>
+                </Border>
+
                 <!--  Native display orientation  -->
                 <Border
                     Padding="15,12,12,12"
diff --git a/HandheldCompanion/Views/Pages/SettingsPage.xaml.cs b/HandheldCompanion/Views/Pages/SettingsPage.xaml.cs
index ab21b864e..d1e03f7b0 100644
--- a/HandheldCompanion/Views/Pages/SettingsPage.xaml.cs
+++ b/HandheldCompanion/Views/Pages/SettingsPage.xaml.cs
@@ -116,6 +116,9 @@ private void SettingsManager_SettingValueChanged(string? name, object value)
                 case "DesktopProfileOnStart":
                     Toggle_DesktopProfileOnStart.IsOn = Convert.ToBoolean(value);
                     break;
+                case "OverrideSteamProfileOnStart":
+                    Toggle_OverrideSteamProfileOnStart.IsOn = Convert.ToBoolean(value);
+                    break;
                 case "NativeDisplayOrientation":
                     var nativeOrientation = (ScreenRotation.Rotations)Convert.ToInt32(value);
 
@@ -207,6 +210,14 @@ private void Toggle_DesktopProfileOnStart_Toggled(object? sender, RoutedEventArg
         SettingsManager.SetProperty("DesktopProfileOnStart", Toggle_DesktopProfileOnStart.IsOn);
     }
 
+    private void Toggle_OverrideSteamProfileOnStart_Toggled(object? sender, RoutedEventArgs? e)
+    {
+        if (!IsLoaded)
+            return;
+
+        SettingsManager.SetProperty("OverrideSteamProfileOnStart", Toggle_OverrideSteamProfileOnStart.IsOn);
+    }
+
     private void Button_DetectNativeDisplayOrientation_Click(object sender, RoutedEventArgs? e)
     {
         if (!IsLoaded)

From 70e3347d19c2e248ec60391893b704077af2d63a Mon Sep 17 00:00:00 2001
From: Jose <39220902+DarkiRuiz@users.noreply.github.com>
Date: Sun, 23 Jun 2024 21:19:29 +0200
Subject: [PATCH 2/2] Update HandheldCompanion/Properties/Resources.Designer.cs

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
---
 HandheldCompanion/Properties/Resources.Designer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/HandheldCompanion/Properties/Resources.Designer.cs b/HandheldCompanion/Properties/Resources.Designer.cs
index f852baa8d..85b360427 100644
--- a/HandheldCompanion/Properties/Resources.Designer.cs
+++ b/HandheldCompanion/Properties/Resources.Designer.cs
@@ -3753,7 +3753,7 @@ public static string Hint_SteamNeptuneDesktopOverridden {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Steam is already running and Steam Desktop Layout is overwritten by Handheld Companion, but this setting was disabled by the user.
+        ///   Looks up a localized string similar to Steam Desktop Layout overwrite was disabled while Steam was running. Please restart Steam to apply changes.
         /// </summary>
         public static string Hint_SteamNeptuneDesktopOverriddenDesc {
             get {