(Un)register windows at the global windows manager of keepass

KeeTrayTOTP.Tests/TrayContextMenuPositionTests.cs

@@ -1,119 +1,119 @@
-using System.Collections.Generic;
-using System.Drawing;
-using KeeTrayTOTP.Libraries;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace KeeTrayTOTP.Tests
-{
-    [TestClass]
-    public class TrayContextMenuPositionTests
-    {
-        [DataTestMethod]
-        [DynamicData(nameof(DropDownLocationTestData))]
-        public void CalculatedLocationForDropDown_Should_ReturnTheCorrectLocation(Size controlSize, Point mousePosition,
-            Rectangle screenRect, Point expectedPoint)
-        {
-            var dropDownLocationCalculator = new DropDownLocationCalculator(controlSize);
-            var sut = dropDownLocationCalculator.CalculateLocationForDropDown(mousePosition, screenRect);
-
-            Assert.AreEqual(expectedPoint, sut);
-        }
-
-        private static IEnumerable<object[]> DropDownLocationTestData
-        {
-            get
-            {
-                var controlSize = new Size(300, 300);
-                var screenRect = new Rectangle(0, 0, 1920, 1080);
-
-                // top-left
-                yield return new object[]
-                {
-                    controlSize, new Point(400, 500), screenRect,
-                    // expected
-                    new Point(400 - controlSize.Width, 500 - controlSize.Height)
-                };
-
-                // top-right
-                yield return new object[]
-                {
-                    controlSize, new Point(200, 500), screenRect,
-                    // expected
-                    new Point(200, 500 - controlSize.Height)
-                };
-
-                // bottom-right
-                yield return new object[]
-                {
-                    controlSize, new Point(200, 200), screenRect,
-                    // expected
-                    new Point(200, 200)
-                };
-
-                // bottom-left
-                yield return new object[]
-                {
-                    controlSize, new Point(400, 200), screenRect,
-                    // expected
-                    new Point(400 - controlSize.Width, 200)
-                };
-
-                // top-left
-                yield return new object[]
-                {
-                    controlSize, new Point(300, 300), screenRect,
-                    // expected
-                    new Point(0, 0)
-                };
-
-                // top-left
-                yield return new object[]
-                {
-                    controlSize, new Point(screenRect.Width, screenRect.Height), screenRect,
-                    // expected
-                    new Point(screenRect.Width - controlSize.Width, screenRect.Height - controlSize.Height)
-                };
-
-                // edge case control size bigger than screen size
-                yield return new object[]
-                {
-                    controlSize, new Point(0, 0), new Rectangle(0, 0, 200, 200),
-                    // expected
-                    new Point(0, 200 - controlSize.Height)
-                };
-
-                // edge case control height bigger than screen height
-                yield return new object[]
-                {
-                    controlSize, new Point(50, 0), new Rectangle(0, 0, 1920, 200),
-                    // expected
-                    new Point(50, 200 - controlSize.Height)
-                };
-
-                // edge case control width bigger than screen width
-                yield return new object[]
-                {
-                    controlSize, new Point(0, 0), new Rectangle(0, 0, 200, 1080),
-                    // expected
-                    new Point(0, 0)
-                };
-
-                // multi monitor test
-                yield return new object[]
-                {
-                    controlSize, new Point(2500, 500), screenRect,
-                    // expected
-                    new Point(2500 - controlSize.Width, 500 - controlSize.Height)
-                };
-
-                // multi monitor test control bigger than screen
-                yield return new object[]
-                {
-                    controlSize, new Point(1200, 150), new Rectangle(1080, 0, 200, 200),
-                    // expected
-                    new Point(1080, 200 - controlSize.Height)
-                };
-            }
-        }
-    }
+using System.Collections.Generic;
+using System.Drawing;
+using KeeTrayTOTP.Libraries;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace KeeTrayTOTP.Tests
+{
+    [TestClass]
+    public class TrayContextMenuPositionTests
+    {
+        [DataTestMethod]
+        [DynamicData(nameof(DropDownLocationTestData))]
+        public void CalculatedLocationForDropDown_Should_ReturnTheCorrectLocation(Size controlSize, Point mousePosition,
+            Rectangle screenRect, Point expectedPoint)
+        {
+            var dropDownLocationCalculator = new DropDownLocationCalculator(controlSize);
+            var sut = dropDownLocationCalculator.CalculateLocationForDropDown(mousePosition, screenRect);
+
+            Assert.AreEqual(expectedPoint, sut);
+        }
+
+        private static IEnumerable<object[]> DropDownLocationTestData
+        {
+            get
+            {
+                var controlSize = new Size(300, 300);
+                var screenRect = new Rectangle(0, 0, 1920, 1080);
+
+                // top-left
+                yield return new object[]
+                {
+                    controlSize, new Point(400, 500), screenRect,
+                    // expected
+                    new Point(400 - controlSize.Width, 500 - controlSize.Height)
+                };
+
+                // top-right
+                yield return new object[]
+                {
+                    controlSize, new Point(200, 500), screenRect,
+                    // expected
+                    new Point(200, 500 - controlSize.Height)
+                };
+
+                // bottom-right
+                yield return new object[]
+                {
+                    controlSize, new Point(200, 200), screenRect,
+                    // expected
+                    new Point(200, 200)
+                };
+
+                // bottom-left
+                yield return new object[]
+                {
+                    controlSize, new Point(400, 200), screenRect,
+                    // expected
+                    new Point(400 - controlSize.Width, 200)
+                };
+
+                // top-left
+                yield return new object[]
+                {
+                    controlSize, new Point(300, 300), screenRect,
+                    // expected
+                    new Point(0, 0)
+                };
+
+                // top-left
+                yield return new object[]
+                {
+                    controlSize, new Point(screenRect.Width, screenRect.Height), screenRect,
+                    // expected
+                    new Point(screenRect.Width - controlSize.Width, screenRect.Height - controlSize.Height)
+                };
+
+                // edge case control size bigger than screen size
+                yield return new object[]
+                {
+                    controlSize, new Point(0, 0), new Rectangle(0, 0, 200, 200),
+                    // expected
+                    new Point(0, 200 - controlSize.Height)
+                };
+
+                // edge case control height bigger than screen height
+                yield return new object[]
+                {
+                    controlSize, new Point(50, 0), new Rectangle(0, 0, 1920, 200),
+                    // expected
+                    new Point(50, 200 - controlSize.Height)
+                };
+
+                // edge case control width bigger than screen width
+                yield return new object[]
+                {
+                    controlSize, new Point(0, 0), new Rectangle(0, 0, 200, 1080),
+                    // expected
+                    new Point(0, 0)
+                };
+
+                // multi monitor test
+                yield return new object[]
+                {
+                    controlSize, new Point(2500, 500), screenRect,
+                    // expected
+                    new Point(2500 - controlSize.Width, 500 - controlSize.Height)
+                };
+
+                // multi monitor test control bigger than screen
+                yield return new object[]
+                {
+                    controlSize, new Point(1200, 150), new Rectangle(1080, 0, 200, 200),
+                    // expected
+                    new Point(1080, 200 - controlSize.Height)
+                };
+            }
+        }
+    }
 }

KeeTrayTOTP/FormAbout.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Reflection;
 using System.Windows.Forms;
+using KeePass.UI;
 
 namespace KeeTrayTOTP
 {
@@ -32,6 +33,8 @@ internal FormAbout(KeeTrayTOTPExt plugin)
         /// <param name="e"></param>
         private void FormAbout_Load(object sender, EventArgs e)
         {
+            GlobalWindowManager.AddWindow(this);
+
             Text = Localization.Strings.About + @" - " + Localization.Strings.TrayTOTPPlugin;
             ListViewAbout.Items[0].SubItems.Add(AssemblyTitle);
             ListViewAbout.Items[1].SubItems.Add(AssemblyCompany);
@@ -151,5 +154,10 @@ internal string AssemblyCompany
                 return ((AssemblyCompanyAttribute)attributes[0]).Company;
             }
         }
+
+        private void FormAbout_FormClosed(object sender, FormClosedEventArgs e)
+        {
+            GlobalWindowManager.RemoveWindow(this);
+        }
     }
 }

KeeTrayTOTP/FormSettings.cs

@@ -1,6 +1,7 @@
 using System;
 using System.ComponentModel;
 using System.Windows.Forms;
+using KeePass.UI;
 
 namespace KeeTrayTOTP
 {
@@ -43,6 +44,8 @@ internal FormSettings(KeeTrayTOTPExt plugin)
         /// <param name="e"></param>
         private void FormSettings_Load(object sender, EventArgs e)
         {
+            GlobalWindowManager.AddWindow(this);
+
             Text = Localization.Strings.Settings + @" - " + Localization.Strings.TrayTOTPPlugin; // Set form's name using constants.
             Working(true, true); // Set controls depending on the state of action.
             WorkerLoad.RunWorkerAsync(); // Load Settings in form controls.
@@ -479,5 +482,10 @@ private void WorkerReset_RunWorkerCompleted(object sender, RunWorkerCompletedEve
         {
             WorkerLoad.RunWorkerAsync("Reset");
         }
+
+        private void FormSettings_FormClosed(object sender, FormClosedEventArgs e)
+        {
+            GlobalWindowManager.RemoveWindow(this);
+        }
     }
 }

KeeTrayTOTP/FormTimeCorrection.cs

@@ -1,6 +1,7 @@
 using System;
 using System.ComponentModel;
 using System.Windows.Forms;
+using KeePass.UI;
 using KeeTrayTOTP.Libraries;
 
 namespace KeeTrayTOTP
@@ -48,6 +49,8 @@ internal FormTimeCorrection(KeeTrayTOTPExt plugin, string url)
         /// <param name="e"></param>
         private void FormTimeCorrection_Load(object sender, EventArgs e)
         {
+            GlobalWindowManager.AddWindow(this);
+
             Text = Localization.Strings.TimeCorrection + @" - " + Localization.Strings.TrayTOTPPlugin; //Sets the form's display text.
             if (_plugin.PluginHost.MainWindow.ActiveDatabase.IsOpen)
             {
@@ -200,5 +203,10 @@ private void ButtonCancel_Click(object sender, EventArgs e)
         {
             //Dialog Result = Cancel
         }
+
+        private void FormTimeCorrection_FormClosed(object sender, FormClosedEventArgs e)
+        {
+            GlobalWindowManager.RemoveWindow(this);
+        }
     }
 }