Added minimize to tray setting

BartoszCichecki · Apr 23, 2024 · 96cb17d · 96cb17d
1 parent c4fcdd7
commit 96cb17d
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 1 deletion.
diff --git a/LenovoLegionToolkit.Lib/Settings/ApplicationSettings.cs b/LenovoLegionToolkit.Lib/Settings/ApplicationSettings.cs
@@ -28,6 +28,7 @@ public class ApplicationSettingsStore
         public RGBColor? AccentColor { get; set; }
         public AccentColorSource AccentColorSource { get; set; }
         public Dictionary<PowerModeState, Guid> PowerPlans { get; set; } = [];
+        public bool MinimizeToTray { get; set; } = true;
         public bool MinimizeOnClose { get; set; }
         public WindowSize? WindowSize { get; set; }
         public bool DontShowNotifications { get; set; }

diff --git a/LenovoLegionToolkit.WPF/Pages/SettingsPage.xaml b/LenovoLegionToolkit.WPF/Pages/SettingsPage.xaml
@@ -82,6 +82,18 @@
                 Visibility="Hidden" />
         </custom:CardControl>
 
+        <custom:CardControl Margin="0,0,0,8">
+            <custom:CardControl.Header>
+                <controls:CardHeaderControl Title="{x:Static resources:Resource.SettingsPage_MinimizeToTray_Title}" Subtitle="{x:Static resources:Resource.SettingsPage_MinimizeToTray_Message}" />
+            </custom:CardControl.Header>
+            <wpfui:ToggleSwitch
+                x:Name="_minimizeToTrayToggle"
+                Margin="0,0,0,8"
+                AutomationProperties.Name="{x:Static resources:Resource.SettingsPage_MinimizeToTray_Title}"
+                Click="MinimizeToTrayToggle_Click"
+                Visibility="Hidden" />
+        </custom:CardControl>
+
         <custom:CardControl Margin="0,0,0,24">
             <custom:CardControl.Header>
                 <controls:CardHeaderControl Title="{x:Static resources:Resource.SettingsPage_MinimizeOnClose_Title}" Subtitle="{x:Static resources:Resource.SettingsPage_MinimizeOnClose_Message}" />

diff --git a/LenovoLegionToolkit.WPF/Pages/SettingsPage.xaml.cs b/LenovoLegionToolkit.WPF/Pages/SettingsPage.xaml.cs
@@ -81,6 +81,7 @@ private async Task RefreshAsync()
         _accentColorSourceComboBox.SetItems(Enum.GetValues<AccentColorSource>(), _settings.Store.AccentColorSource, t => t.GetDisplayName());
 
         _autorunComboBox.SetItems(Enum.GetValues<AutorunState>(), Autorun.State, t => t.GetDisplayName());
+        _minimizeToTrayToggle.IsChecked = _settings.Store.MinimizeToTray;
         _minimizeOnCloseToggle.IsChecked = _settings.Store.MinimizeOnClose;
 
         var vantageStatus = await _vantageDisabler.GetStatusAsync();
@@ -118,6 +119,7 @@ private async Task RefreshAsync()
 
         _themeComboBox.Visibility = Visibility.Visible;
         _autorunComboBox.Visibility = Visibility.Visible;
+        _minimizeToTrayToggle.Visibility = Visibility.Visible;
         _minimizeOnCloseToggle.Visibility = Visibility.Visible;
         _vantageToggle.Visibility = Visibility.Visible;
         _legionZoneToggle.Visibility = Visibility.Visible;
@@ -233,6 +235,19 @@ private void SmartKeyDoublePressActionCard_Click(object sender, RoutedEventArgs
         window.ShowDialog();
     }
 
+    private void MinimizeToTrayToggle_Click(object sender, RoutedEventArgs e)
+    {
+        if (_isRefreshing)
+            return;
+
+        var state = _minimizeToTrayToggle.IsChecked;
+        if (state is null)
+            return;
+
+        _settings.Store.MinimizeToTray = state.Value;
+        _settings.SynchronizeStore();
+    }
+
     private void MinimizeOnCloseToggle_Click(object sender, RoutedEventArgs e)
     {
         if (_isRefreshing)

diff --git a/LenovoLegionToolkit.WPF/Resources/Resource.Designer.cs b/LenovoLegionToolkit.WPF/Resources/Resource.Designer.cs
diff --git a/LenovoLegionToolkit.WPF/Resources/Resource.resx b/LenovoLegionToolkit.WPF/Resources/Resource.resx
@@ -2056,4 +2056,10 @@ Supported formats are: {1}.</value>
   <data name="RunAutomationStepControl_ProcessWaitUntilFinished_Description" xml:space="preserve">
 	  <value>Wait until program or script finishes executing</value>
   </data>
+  <data name="SettingsPage_MinimizeToTray_Title" xml:space="preserve">
+	  <value>Minimize to tray</value>
+  </data>
+  <data name="SettingsPage_MinimizeToTray_Message" xml:space="preserve">
+	  <value>Always minimize to tray instead of taskbar.</value>
+  </data>
 </root>
diff --git a/LenovoLegionToolkit.WPF/Windows/MainWindow.xaml.cs b/LenovoLegionToolkit.WPF/Windows/MainWindow.xaml.cs
@@ -263,7 +263,10 @@ public void ShowUpdateWindow()
 
     public void SendToTray()
     {
+        if (!_applicationSettings.Store.MinimizeToTray)
+            return;
+
         Hide();
-        ShowInTaskbar = false;
+        ShowInTaskbar = true;
     }
 }