fix: 横屏时窗口可能跑到外面去

Author: clansty

MaiChartManager/Browser.cs

@@ -28,15 +28,22 @@ public Browser(string? loopbackUrl = null)
         webView21.DefaultBackgroundColor = Color.Transparent;
         IapManager.BindToForm(this);
 
-        // 竖屏显示器时，限制窗口高度不超过显示器宽度的 2/3
+        // 限制窗口高度
         var landscape = Screen.AllScreens.FirstOrDefault(s => s.WorkingArea.Width >= s.WorkingArea.Height);
         if (landscape == null)
         {
+            // 竖屏显示器时，限制窗口高度不超过显示器宽度的 2/3
             var portrait = Screen.PrimaryScreen ?? Screen.AllScreens[0];
             var maxHeight = portrait.WorkingArea.Width * 2 / 3;
             if (Height > maxHeight)
                 Height = maxHeight;
         }
+        else
+        {
+            var maxHeight = landscape.WorkingArea.Height;
+            if (Height > maxHeight)
+                Height = maxHeight;
+        }
 
         StartPosition = FormStartPosition.Manual;
         Location = WebViewHelper.CalculatePosition(Width, Height);

MaiChartManager/WebViewHelper.cs

@@ -15,7 +15,7 @@ public static Point CalculatePosition(int width, int height)
             var area = landscape.WorkingArea;
             return new Point(
                 area.X + (area.Width - width) / 2,
-                area.Y + (area.Height - height) / 2
+                Math.Max(area.Y, area.Y + (area.Height - height) / 2)
             );
         }
 
@@ -25,7 +25,7 @@ public static Point CalculatePosition(int width, int height)
         var squareTop = pArea.Bottom - squareSize;
         return new Point(
             pArea.X + (squareSize - width) / 2,
-            squareTop + (squareSize - height) / 2
+            Math.Max(pArea.Y, squareTop + (squareSize - height) / 2)
         );
     }