From e6767126c93bfe96527c0ec6fa85bb81849a8ffe Mon Sep 17 00:00:00 2001
From: Serge <5920850+seerge@users.noreply.github.com>
Date: Fri, 16 Aug 2024 16:50:41 +0200
Subject: [PATCH] Main window position tweak
 https://github.com/seerge/g-helper/issues/2983

---
 app/Program.cs | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/Program.cs b/app/Program.cs
index e6387046..302fc24e 100644
--- a/app/Program.cs
+++ b/app/Program.cs
@@ -282,19 +282,20 @@ namespace GHelper
             }
             else
             {
+                var screen = Screen.FromControl(settingsForm);
 
-                settingsForm.Left = Screen.FromControl(settingsForm).WorkingArea.Width - 10 - settingsForm.Width;
-                settingsForm.Top = Screen.FromControl(settingsForm).WorkingArea.Height - 10 - settingsForm.Height;
+                settingsForm.Left = screen.WorkingArea.X + screen.WorkingArea.Width - 10 - settingsForm.Width;
+                settingsForm.Top = screen.WorkingArea.Height - 10 - settingsForm.Height;
 
                 settingsForm.Show();
                 settingsForm.Activate();
 
-                settingsForm.Left = Screen.FromControl(settingsForm).WorkingArea.Width - 10 - settingsForm.Width;
+                settingsForm.Left = screen.WorkingArea.X + screen.WorkingArea.Width - 10 - settingsForm.Width;
                 
                 if (AppConfig.IsAlly())
-                    settingsForm.Top = Math.Max(10, Screen.FromControl(settingsForm).Bounds.Height - 110 - settingsForm.Height);
+                    settingsForm.Top = Math.Max(10, screen.Bounds.Height - 110 - settingsForm.Height);
                 else
-                    settingsForm.Top = Screen.FromControl(settingsForm).WorkingArea.Height - 10 - settingsForm.Height;
+                    settingsForm.Top = screen.WorkingArea.Height - 10 - settingsForm.Height;
 
                 settingsForm.VisualiseGPUMode();
             }