From f99d31c72db7264c7980207a9cf5404a8fa33ce4 Mon Sep 17 00:00:00 2001
From: Manuel Kamper <manuelk@outlook.com>
Date: Sun, 12 Jan 2020 09:37:11 +0100
Subject: [PATCH] resolve screen position bug #1

---
 Mk0.Software.ImageSorter/Main.Designer.cs            |  4 ++--
 Mk0.Software.ImageSorter/Main.cs                     | 12 ++++++++++--
 .../Mk0.Software.ImageSorter.csproj                  |  2 +-
 Mk0.Software.ImageSorter/Properties/AssemblyInfo.cs  |  2 +-
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/Mk0.Software.ImageSorter/Main.Designer.cs b/Mk0.Software.ImageSorter/Main.Designer.cs
index 3b1f0c6..7aa28f7 100644
--- a/Mk0.Software.ImageSorter/Main.Designer.cs
+++ b/Mk0.Software.ImageSorter/Main.Designer.cs
@@ -693,12 +693,12 @@
             this.MinimumSize = new System.Drawing.Size(983, 605);
             this.Name = "Main";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
-            this.Text = "Image Sorter v1.49 | © 2015-2020 by mk0.at";
+            this.Text = "Image Sorter v1.50 | © 2015-2020 by mk0.at";
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Main_FormClosing);
             this.Load += new System.EventHandler(this.Main_Load);
             this.Shown += new System.EventHandler(this.Main_Shown);
             this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.Main_KeyDown);
-            this.Resize += new System.EventHandler(this.Main_ResizeEnd);
+            this.Resize += new System.EventHandler(this.Main_Resize);
             ((System.ComponentModel.ISupportInitialize)(this.pictureBoxImage)).EndInit();
             this.contextMenuStrip.ResumeLayout(false);
             this.groupBoxInformationen.ResumeLayout(false);
diff --git a/Mk0.Software.ImageSorter/Main.cs b/Mk0.Software.ImageSorter/Main.cs
index 164b9dc..8b66465 100644
--- a/Mk0.Software.ImageSorter/Main.cs
+++ b/Mk0.Software.ImageSorter/Main.cs
@@ -44,6 +44,7 @@ namespace Mk0.Software.ImageSorter
         private string startupimage;
         public string[] Args;
         private System.Timers.Timer t1 = new System.Timers.Timer(1200);
+        private FormWindowState lastState = FormWindowState.Minimized;
 
         public Main()
         {
@@ -104,9 +105,12 @@ namespace Mk0.Software.ImageSorter
                     LoadPicture(GetImageIndex(Path.Combine(startuppath, startupimage)));
                     if (WindowState != FormWindowState.Normal || WindowState != FormWindowState.Maximized)
                     {
-                        WindowState = FormWindowState.Normal;
+                        if (lastState != FormWindowState.Minimized) { WindowState = lastState; } else { WindowState = FormWindowState.Normal; }
                     }
+                    Activate();
                     BringToFront();
+                    TopMost = true;
+                    TopMost = false;
                 }
             }
         }
@@ -1258,8 +1262,12 @@ namespace Mk0.Software.ImageSorter
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        private void Main_ResizeEnd(object sender, EventArgs e)
+        private void Main_Resize(object sender, EventArgs e)
         {
+            if (WindowState != FormWindowState.Minimized)
+            {
+                lastState = WindowState;
+            }
             try
             {
                 Zoom();
diff --git a/Mk0.Software.ImageSorter/Mk0.Software.ImageSorter.csproj b/Mk0.Software.ImageSorter/Mk0.Software.ImageSorter.csproj
index d8e27cd..c409443 100644
--- a/Mk0.Software.ImageSorter/Mk0.Software.ImageSorter.csproj
+++ b/Mk0.Software.ImageSorter/Mk0.Software.ImageSorter.csproj
@@ -33,7 +33,7 @@
     <PublisherName>manuelkamper.com</PublisherName>
     <OpenBrowserOnPublish>false</OpenBrowserOnPublish>
     <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.49.0.0</ApplicationVersion>
+    <ApplicationVersion>1.50.0.0</ApplicationVersion>
     <UseApplicationTrust>true</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
     <ExcludeDeploymentUrl>true</ExcludeDeploymentUrl>
diff --git a/Mk0.Software.ImageSorter/Properties/AssemblyInfo.cs b/Mk0.Software.ImageSorter/Properties/AssemblyInfo.cs
index de0ff5e..8c2d4d0 100644
--- a/Mk0.Software.ImageSorter/Properties/AssemblyInfo.cs
+++ b/Mk0.Software.ImageSorter/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern 
 // übernehmen, indem Sie "*" eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.49.*")]
+[assembly: AssemblyVersion("1.50.*")]
 //[assembly: AssemblyFileVersion("1.6.0.0")]