From 70d08aa4c3823063c5c6fe1846cd936842e85dee Mon Sep 17 00:00:00 2001
From: Stone_Red <56473591+Stone-Red-Code@users.noreply.github.com>
Date: Tue, 25 Feb 2025 23:04:44 +0100
Subject: [PATCH] Set WindowState of main window to Minimized when closing

---
 src/DesktopMagic/MainWindow.xaml    |  2 +-
 src/DesktopMagic/MainWindow.xaml.cs | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/DesktopMagic/MainWindow.xaml b/src/DesktopMagic/MainWindow.xaml
index 94d78db..a2aef8b 100644
--- a/src/DesktopMagic/MainWindow.xaml
+++ b/src/DesktopMagic/MainWindow.xaml
@@ -38,7 +38,7 @@
                     <DockPanel Margin="0,0,2.5,0">
                         <Grid DockPanel.Dock="Top">
                             <Rectangle Grid.Row="1" Fill="#FFECECEC" Height="24" />
-                            <CheckBox x:Name="EditCheckBox" VerticalAlignment="Center" Grid.Row="1" Content="{DynamicResource edit}" Click="EditCheckBox_Click" Foreground="Black" BorderBrush="#FF323232" Style="{StaticResource MaterialDesignDarkCheckBox}" IsChecked="True" />
+                            <CheckBox x:Name="editCheckBox" VerticalAlignment="Center" Grid.Row="1" Content="{DynamicResource edit}" Click="EditCheckBox_Click" Foreground="Black" BorderBrush="#FF323232" Style="{StaticResource MaterialDesignDarkCheckBox}" IsChecked="True" />
                         </Grid>
                         <ScrollViewer Background="#FFBBBBBB" PreviewMouseWheel="ScrollViewer_PreviewMouseWheel">
                             <ItemsControl ItemsSource="{Binding Settings.CurrentLayout.Plugins}">
diff --git a/src/DesktopMagic/MainWindow.xaml.cs b/src/DesktopMagic/MainWindow.xaml.cs
index dfb5214..9b0d488 100644
--- a/src/DesktopMagic/MainWindow.xaml.cs
+++ b/src/DesktopMagic/MainWindow.xaml.cs
@@ -59,7 +59,7 @@ namespace DesktopMagic
                     Items =
                     {
                         new System.Windows.Forms.ToolStripMenuItem((string)App.LanguageDictionary["open"], null, (s, e) => RestoreWindow()),
-                        new System.Windows.Forms.ToolStripMenuItem((string)App.LanguageDictionary    ["toggleEditMode"], null, (s, e) => { EditCheckBox.IsChecked = !EditCheckBox.IsChecked; EditCheckBox_Click(null, null); }),
+                        new System.Windows.Forms.ToolStripMenuItem((string)App.LanguageDictionary["toggleEditMode"], null, (s, e) => { editCheckBox.IsChecked = !editCheckBox.IsChecked; EditCheckBox_Click(null, null); }),
                         new System.Windows.Forms.ToolStripMenuItem((string)App.LanguageDictionary["pluginManager"], null, (s, e) => PluginManagerButton_Click(null!, null!)),
                         new System.Windows.Forms.ToolStripMenuItem("GitHub", null, (s, e) => GitHubButton_Click(null!, null!)),
                         new System.Windows.Forms.ToolStripMenuItem((string)App.LanguageDictionary["quit"], null, (s, e) => Quit()),
@@ -174,7 +174,7 @@ namespace DesktopMagic
         {
             foreach (PluginWindow window in Windows)
             {
-                window.SetEditMode(EditCheckBox.IsChecked == true);
+                window.SetEditMode(editCheckBox.IsChecked == true);
             }
 
             SaveSettings();
@@ -264,7 +264,7 @@ namespace DesktopMagic
 
             window.ShowInTaskbar = false;
             window.Show();
-            window.SetEditMode(EditCheckBox.IsChecked == true);
+            window.SetEditMode(editCheckBox.IsChecked == true);
             window.ContentRendered += DisplayWindow_ContentRendered;
             window.Closing += DisplayWindow_Closing;
             Windows.Add(window);
@@ -284,9 +284,10 @@ namespace DesktopMagic
             {
                 e.Cancel = true;
 
-                EditCheckBox.IsChecked = false;
+                editCheckBox.IsChecked = false;
                 EditCheckBox_Click(null, null);
                 ShowInTaskbar = false;
+                WindowState = WindowState.Minimized;
                 Visibility = Visibility.Collapsed;
 
                 foreach (Window item in Windows)
@@ -588,7 +589,7 @@ namespace DesktopMagic
                 window.Close();
             }
 
-            EditCheckBox.IsChecked = false;
+            editCheckBox.IsChecked = false;
             EditCheckBox_Click(null, null);
             blockWindowsClosing = true;
             Windows.Clear();