Panel will now recentre on main screen if it is not visible. Quick Ob…

…servation window changed to centre on panel just like all other EAACP dialogs.

EAACP.csproj

@@ -137,6 +137,7 @@
     <Compile Include="StellariumControl.Designer.cs">
       <DependentUpon>StellariumControl.cs</DependentUpon>
     </Compile>
+    <Compile Include="WindowCentre.cs" />
     <EmbeddedResource Include="Config.resx">
       <DependentUpon>Config.cs</DependentUpon>
     </EmbeddedResource>

Form1.cs

@@ -97,8 +97,13 @@ public frmCP()
             {
                 this.Width = Properties.Settings.Default.frmWidth;
                 this.Height = Properties.Settings.Default.frmHeight;
+                this.Left = Properties.Settings.Default.XPos;
+                this.Top = Properties.Settings.Default.YPos;
 
-                if (Screen.PrimaryScreen.Bounds.Width > Properties.Settings.Default.XPos + this.Width)
+                // Center the form on the screen, if the form is larger off the screen then center the form on the screen
+                WindowHelper.EnsureWindowVisible(this);
+
+               /* if (Screen.PrimaryScreen.Bounds.Width > Properties.Settings.Default.XPos + this.Width)
                 {
                     this.Left = Properties.Settings.Default.XPos;
                     if (System.Windows.Forms.Screen.PrimaryScreen.Bounds.Height > Properties.Settings.Default.YPos + this.Height)
@@ -113,7 +118,7 @@ public frmCP()
                 else
                 {
                     this.CenterToScreen();
-                }
+                } */
             }
 
             SetTimer();
@@ -472,7 +477,7 @@ private void btnQuickObs_Click(object sender, EventArgs e)
 
             using (QuickObs formObs = new QuickObs())
             {
-                formObs.TopMost = true; 
+                formObs.TopMost = true;
 
                 // Associated objects
                 formObs.Controls["chkAssociated"].Visible = bAssociated;

QuickObs.cs

@@ -15,30 +15,6 @@ public partial class QuickObs : Form
         public QuickObs()
         {
             InitializeComponent();
-
-            if (Properties.Settings.Default.QOYPos == -1)
-            {
-                this.CenterToParent();
-            }
-            else
-            {
-                if (Screen.PrimaryScreen.Bounds.Width > Properties.Settings.Default.QOXPos + this.Width)
-                {
-                    this.Left = Properties.Settings.Default.QOXPos;
-                    if (System.Windows.Forms.Screen.PrimaryScreen.Bounds.Height > Properties.Settings.Default.QOYPos + this.Height)
-                    {
-                        this.Top = Properties.Settings.Default.QOYPos;
-                    }
-                    else
-                    {
-                        this.CenterToParent();
-                    }
-                }
-                else
-                {
-                    this.CenterToParent();
-                }
-            }
         }
 
         private void btnCancel_Click(object sender, EventArgs e)

WindowCentre.cs

@@ -0,0 +1,44 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace EAACP
+{
+    internal class WindowHelper
+    {
+        public static void EnsureWindowVisible(Form form, Form parent = null)
+        {
+            bool isVisible = false;
+
+            // Check if the window is at least partially visible on any screen
+            foreach (Screen screen in Screen.AllScreens)
+            {
+                if (screen.WorkingArea.IntersectsWith(form.Bounds))
+                {
+                    isVisible = true;
+                    return;
+                }
+            }
+
+            // If the window is not visible on any screen, center it on the primary screen
+            if (!isVisible)
+            {
+                if (parent != null)
+                {
+                    form.StartPosition = FormStartPosition.CenterParent;
+                    return;
+                }
+
+                var primary = Screen.PrimaryScreen;
+                var primaryWorkingArea = primary.WorkingArea;
+                int primaryCenterX = (primaryWorkingArea.Right - form.Width) / 2;
+                int primaryCenterY = (primaryWorkingArea.Bottom - form.Height) / 2;
+                form.Location = new Point(primaryCenterX, primaryCenterY);
+            }
+        }
+    }
+}