From 72a0c342c32f019b35d101635c5b1271abedc7ed Mon Sep 17 00:00:00 2001
From: Brett Hewitson <bletch1971@hotmail.com>
Date: Thu, 9 Dec 2021 20:33:14 +1000
Subject: [PATCH] Server Monitor window now stores it's location.

---
 src/ARKServerManager/App.config               |  6 +++++
 src/ARKServerManager/Config.Designer.cs       | 24 +++++++++++++++++++
 src/ARKServerManager/Config.settings          |  6 +++++
 src/ARKServerManager/VersionFeed.xml          |  1 +
 src/ARKServerManager/VersionFeedBeta.xml      |  1 +
 .../Windows/ServerMonitorWindow.xaml          |  2 +-
 .../Windows/ServerMonitorWindow.xaml.cs       | 21 ++++++++++++----
 src/ConanServerManager/App.config             |  6 +++++
 src/ConanServerManager/Config.Designer.cs     | 24 +++++++++++++++++++
 src/ConanServerManager/Config.settings        |  6 +++++
 src/ConanServerManager/VersionFeed.xml        |  1 +
 src/ConanServerManager/VersionFeedBeta.xml    |  1 +
 .../Windows/ServerMonitorWindow.xaml          |  2 +-
 .../Windows/ServerMonitorWindow.xaml.cs       | 21 ++++++++++++----
 14 files changed, 110 insertions(+), 12 deletions(-)

diff --git a/src/ARKServerManager/App.config b/src/ARKServerManager/App.config
index 446c2530..febac3a6 100644
--- a/src/ARKServerManager/App.config
+++ b/src/ARKServerManager/App.config
@@ -843,6 +843,12 @@
       <setting name="AllowDiscordStop" serializeAs="String">
         <value>True</value>
       </setting>
+      <setting name="ServerMonitorWindow_Left" serializeAs="String">
+        <value>50</value>
+      </setting>
+      <setting name="ServerMonitorWindow_Top" serializeAs="String">
+        <value>50</value>
+      </setting>
     </ServerManagerTool.Config>
   </userSettings>
 </configuration>
diff --git a/src/ARKServerManager/Config.Designer.cs b/src/ARKServerManager/Config.Designer.cs
index 7eed5ed1..5f9d64bb 100644
--- a/src/ARKServerManager/Config.Designer.cs
+++ b/src/ARKServerManager/Config.Designer.cs
@@ -2962,5 +2962,29 @@ namespace ServerManagerTool {
                 this["AllowDiscordStop"] = value;
             }
         }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("50")]
+        public double ServerMonitorWindow_Left {
+            get {
+                return ((double)(this["ServerMonitorWindow_Left"]));
+            }
+            set {
+                this["ServerMonitorWindow_Left"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("50")]
+        public double ServerMonitorWindow_Top {
+            get {
+                return ((double)(this["ServerMonitorWindow_Top"]));
+            }
+            set {
+                this["ServerMonitorWindow_Top"] = value;
+            }
+        }
     }
 }
diff --git a/src/ARKServerManager/Config.settings b/src/ARKServerManager/Config.settings
index 9ee1d712..c11d5ae4 100644
--- a/src/ARKServerManager/Config.settings
+++ b/src/ARKServerManager/Config.settings
@@ -818,5 +818,11 @@
     <Setting Name="AllowDiscordStop" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
     </Setting>
+    <Setting Name="ServerMonitorWindow_Left" Type="System.Double" Scope="User">
+      <Value Profile="(Default)">50</Value>
+    </Setting>
+    <Setting Name="ServerMonitorWindow_Top" Type="System.Double" Scope="User">
+      <Value Profile="(Default)">50</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
\ No newline at end of file
diff --git a/src/ARKServerManager/VersionFeed.xml b/src/ARKServerManager/VersionFeed.xml
index c2380424..8b6e6bc3 100644
--- a/src/ARKServerManager/VersionFeed.xml
+++ b/src/ARKServerManager/VersionFeed.xml
@@ -33,6 +33,7 @@
           <br/>
           <ul>
             <li>Global Settings - Added reset button to the Data Directory Location.</li>
+            <li>Server Monitor window now stores it's location.</li>
             <li>pt-BR Translation file updated.</li>
             <li>ru-RU Translation file updated.</li>
             <li>zh-CN Translation file updated.</li>
diff --git a/src/ARKServerManager/VersionFeedBeta.xml b/src/ARKServerManager/VersionFeedBeta.xml
index 4d6320e6..7b6ad6a5 100644
--- a/src/ARKServerManager/VersionFeedBeta.xml
+++ b/src/ARKServerManager/VersionFeedBeta.xml
@@ -19,6 +19,7 @@
           <u style="font-size: .9em;">CHANGE</u>
           <br/>
           <ul>
+            <li>Server Monitor window now stores it's location.</li>
             <li>Reference library updates.</li>
             <li>pt-BR Translation file updated.</li>
             <li>ru-RU Translation file updated.</li>
diff --git a/src/ARKServerManager/Windows/ServerMonitorWindow.xaml b/src/ARKServerManager/Windows/ServerMonitorWindow.xaml
index acacb095..d2791ff9 100644
--- a/src/ARKServerManager/Windows/ServerMonitorWindow.xaml
+++ b/src/ARKServerManager/Windows/ServerMonitorWindow.xaml
@@ -10,7 +10,7 @@
         xmlns:vm="clr-namespace:ServerManagerTool.Lib.ViewModel"
         mc:Ignorable="d"
         MinWidth="600" MinHeight="500" Width="900" Height="500" Left="50" Top="50" ResizeMode="CanResize"
-        Loaded="Window_Loaded" SizeChanged="Window_SizeChanged" StateChanged="Window_StateChanged"
+        Loaded="ServerMonitorWindow_Loaded" SizeChanged="ServerMonitorWindow_SizeChanged" StateChanged="ServerMonitorWindow_StateChanged" LocationChanged="ServerMonitorWindow_LocationChanged"
         Name="ServerMonitorUI" Icon="../Art/favicon.ico" Title="{DynamicResource ServerMonitor_Title}">
     <Window.Resources>
         <ResourceDictionary>
diff --git a/src/ARKServerManager/Windows/ServerMonitorWindow.xaml.cs b/src/ARKServerManager/Windows/ServerMonitorWindow.xaml.cs
index a72fba33..887b909e 100644
--- a/src/ARKServerManager/Windows/ServerMonitorWindow.xaml.cs
+++ b/src/ARKServerManager/Windows/ServerMonitorWindow.xaml.cs
@@ -53,6 +53,8 @@ namespace ServerManagerTool.Windows
 
             SetWindowTitle();
 
+            this.Left = Config.Default.ServerMonitorWindow_Left;
+            this.Top = Config.Default.ServerMonitorWindow_Top;
             this.Height = Config.Default.ServerMonitorWindow_Height;
             this.Width = Config.Default.ServerMonitorWindow_Width;
 
@@ -86,7 +88,7 @@ namespace ServerManagerTool.Windows
             set { SetValue(IsStandAloneWindowProperty, value); }
         }
 
-        private void Window_Loaded(object sender, RoutedEventArgs e)
+        private void ServerMonitorWindow_Loaded(object sender, RoutedEventArgs e)
         {
             if (ServerManager == null)
             {
@@ -120,12 +122,16 @@ namespace ServerManagerTool.Windows
             }
         }
 
-        private void Window_Closed(object sender, EventArgs e)
+        private void ServerMonitorWindow_LocationChanged(object sender, EventArgs e)
         {
-            this.Activate();
+            if (this.WindowState == WindowState.Normal)
+            {
+                Config.Default.ServerMonitorWindow_Left = Math.Max(0D, this.Left);
+                Config.Default.ServerMonitorWindow_Top = Math.Max(0D, this.Top);
+            }
         }
 
-        private void Window_SizeChanged(object sender, SizeChangedEventArgs e)
+        private void ServerMonitorWindow_SizeChanged(object sender, SizeChangedEventArgs e)
         {
             if (this.WindowState != WindowState.Minimized)
             {
@@ -134,7 +140,7 @@ namespace ServerManagerTool.Windows
             }
         }
 
-        private void Window_StateChanged(object sender, EventArgs e)
+        private void ServerMonitorWindow_StateChanged(object sender, EventArgs e)
         {
             if (IsStandAloneWindow && Config.Default.MainWindow_MinimizeToTray && this.WindowState == WindowState.Minimized)
             {
@@ -142,6 +148,11 @@ namespace ServerManagerTool.Windows
             }
         }
 
+        private void Window_Closed(object sender, EventArgs e)
+        {
+            this.Activate();
+        }
+
         protected override void OnClosing(CancelEventArgs e)
         {
             if (this.OwnedWindows.OfType<ProgressWindow>().Any())
diff --git a/src/ConanServerManager/App.config b/src/ConanServerManager/App.config
index 30962fd5..bd610257 100644
--- a/src/ConanServerManager/App.config
+++ b/src/ConanServerManager/App.config
@@ -609,6 +609,12 @@
       <setting name="AllowDiscordStop" serializeAs="String">
         <value>True</value>
       </setting>
+      <setting name="ServerMonitorWindow_Left" serializeAs="String">
+        <value>50</value>
+      </setting>
+      <setting name="ServerMonitorWindow_Top" serializeAs="String">
+        <value>50</value>
+      </setting>
     </ServerManagerTool.Config>
   </userSettings>
 </configuration>
\ No newline at end of file
diff --git a/src/ConanServerManager/Config.Designer.cs b/src/ConanServerManager/Config.Designer.cs
index e11896ed..994ba21a 100644
--- a/src/ConanServerManager/Config.Designer.cs
+++ b/src/ConanServerManager/Config.Designer.cs
@@ -2115,5 +2115,29 @@ namespace ServerManagerTool {
                 this["AllowDiscordStop"] = value;
             }
         }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("50")]
+        public double ServerMonitorWindow_Left {
+            get {
+                return ((double)(this["ServerMonitorWindow_Left"]));
+            }
+            set {
+                this["ServerMonitorWindow_Left"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("50")]
+        public double ServerMonitorWindow_Top {
+            get {
+                return ((double)(this["ServerMonitorWindow_Top"]));
+            }
+            set {
+                this["ServerMonitorWindow_Top"] = value;
+            }
+        }
     }
 }
diff --git a/src/ConanServerManager/Config.settings b/src/ConanServerManager/Config.settings
index 8716e104..90cf58e4 100644
--- a/src/ConanServerManager/Config.settings
+++ b/src/ConanServerManager/Config.settings
@@ -584,5 +584,11 @@
     <Setting Name="AllowDiscordStop" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
     </Setting>
+    <Setting Name="ServerMonitorWindow_Left" Type="System.Double" Scope="User">
+      <Value Profile="(Default)">50</Value>
+    </Setting>
+    <Setting Name="ServerMonitorWindow_Top" Type="System.Double" Scope="User">
+      <Value Profile="(Default)">50</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
\ No newline at end of file
diff --git a/src/ConanServerManager/VersionFeed.xml b/src/ConanServerManager/VersionFeed.xml
index c28bc2da..0b6da262 100644
--- a/src/ConanServerManager/VersionFeed.xml
+++ b/src/ConanServerManager/VersionFeed.xml
@@ -32,6 +32,7 @@
           <br/>
           <ul>
             <li>Global Settings - Added reset button to the Data Directory Location.</li>
+            <li>Server Monitor window now stores it's location.</li>
           </ul>
         </p>
       </div>
diff --git a/src/ConanServerManager/VersionFeedBeta.xml b/src/ConanServerManager/VersionFeedBeta.xml
index 086274f8..fd5add6d 100644
--- a/src/ConanServerManager/VersionFeedBeta.xml
+++ b/src/ConanServerManager/VersionFeedBeta.xml
@@ -19,6 +19,7 @@
           <u style="font-size: .9em;">BUGFIX</u>
           <br/>
           <ul>
+            <li>Server Monitor window now stores it's location.</li>
             <li>Reference library updates.</li>
           </ul>
         </p>
diff --git a/src/ConanServerManager/Windows/ServerMonitorWindow.xaml b/src/ConanServerManager/Windows/ServerMonitorWindow.xaml
index f9757fda..8d28adf1 100644
--- a/src/ConanServerManager/Windows/ServerMonitorWindow.xaml
+++ b/src/ConanServerManager/Windows/ServerMonitorWindow.xaml
@@ -10,7 +10,7 @@
         xmlns:vm="clr-namespace:ServerManagerTool.Lib.ViewModel"
         mc:Ignorable="d"
         MinWidth="600" MinHeight="500" Width="900" Height="500" Left="50" Top="50" ResizeMode="CanResize"
-        Loaded="Window_Loaded" SizeChanged="Window_SizeChanged" StateChanged="Window_StateChanged"
+        Loaded="ServerMonitorWindow_Loaded" SizeChanged="ServerMonitorWindow_SizeChanged" StateChanged="ServerMonitorWindow_StateChanged" LocationChanged="ServerMonitorWindow_LocationChanged"
         Name="ServerMonitorUI" Icon="../Art/favicon.ico" Title="{DynamicResource ServerMonitor_Title}">
     <Window.Resources>
         <ResourceDictionary>
diff --git a/src/ConanServerManager/Windows/ServerMonitorWindow.xaml.cs b/src/ConanServerManager/Windows/ServerMonitorWindow.xaml.cs
index c9e0c693..6048faa7 100644
--- a/src/ConanServerManager/Windows/ServerMonitorWindow.xaml.cs
+++ b/src/ConanServerManager/Windows/ServerMonitorWindow.xaml.cs
@@ -53,6 +53,8 @@ namespace ServerManagerTool.Windows
 
             SetWindowTitle();
 
+            this.Left = Config.Default.ServerMonitorWindow_Left;
+            this.Top = Config.Default.ServerMonitorWindow_Top;
             this.Height = Config.Default.ServerMonitorWindow_Height;
             this.Width = Config.Default.ServerMonitorWindow_Width;
 
@@ -86,7 +88,7 @@ namespace ServerManagerTool.Windows
             set { SetValue(IsStandAloneWindowProperty, value); }
         }
 
-        private void Window_Loaded(object sender, RoutedEventArgs e)
+        private void ServerMonitorWindow_Loaded(object sender, RoutedEventArgs e)
         {
             if (ServerManager == null)
             {
@@ -120,12 +122,16 @@ namespace ServerManagerTool.Windows
             }
         }
 
-        private void Window_Closed(object sender, EventArgs e)
+        private void ServerMonitorWindow_LocationChanged(object sender, EventArgs e)
         {
-            this.Activate();
+            if (this.WindowState == WindowState.Normal)
+            {
+                Config.Default.ServerMonitorWindow_Left = Math.Max(0D, this.Left);
+                Config.Default.ServerMonitorWindow_Top = Math.Max(0D, this.Top);
+            }
         }
 
-        private void Window_SizeChanged(object sender, SizeChangedEventArgs e)
+        private void ServerMonitorWindow_SizeChanged(object sender, SizeChangedEventArgs e)
         {
             if (this.WindowState != WindowState.Minimized)
             {
@@ -134,7 +140,7 @@ namespace ServerManagerTool.Windows
             }
         }
 
-        private void Window_StateChanged(object sender, EventArgs e)
+        private void ServerMonitorWindow_StateChanged(object sender, EventArgs e)
         {
             if (IsStandAloneWindow && Config.Default.MainWindow_MinimizeToTray && this.WindowState == WindowState.Minimized)
             {
@@ -142,6 +148,11 @@ namespace ServerManagerTool.Windows
             }
         }
 
+        private void Window_Closed(object sender, EventArgs e)
+        {
+            this.Activate();
+        }
+
         protected override void OnClosing(CancelEventArgs e)
         {
             if (this.OwnedWindows.OfType<ProgressWindow>().Any())