From 073f4cb22cbc40832796fabcd4e84545cf040a8f Mon Sep 17 00:00:00 2001 From: Sunny Date: Sun, 28 Jul 2024 23:39:19 +0800 Subject: [PATCH] =?UTF-8?q?*=20UIForm:=20=E6=9C=80=E5=A4=A7=E5=8C=96?= =?UTF-8?q?=E5=90=8E=EF=BC=8C=E9=BC=A0=E6=A0=87=E5=8D=95=E5=87=BB=E6=A0=87?= =?UTF-8?q?=E9=A2=98=E6=A0=8F=E6=9C=80=E4=B8=8A=E6=96=B9=EF=BC=8C=E4=B8=8D?= =?UTF-8?q?=E6=81=A2=E5=A4=8D=E6=AD=A3=E5=B8=B8=E5=A4=A7=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SunnyUI/Forms/UIForm.cs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/SunnyUI/Forms/UIForm.cs b/SunnyUI/Forms/UIForm.cs index 0ab53fcc..f8861627 100644 --- a/SunnyUI/Forms/UIForm.cs +++ b/SunnyUI/Forms/UIForm.cs @@ -60,6 +60,7 @@ * 2024-06-08: V3.6.6 防止图标转换错误 * 2024-07-20: V3.6.8 修改为初始化最大化后恢复时界面尺寸大小正常 * 2024-07-26: V3.6.8 修复鼠标点击事件 + * 2024-07-28: V3.6.8 最大化后，鼠标点击标题栏最上方，不恢复正常大小 ******************************************************************************/ using System; @@ -260,7 +261,7 @@ namespace Sunny.UI public event EventHandler ExtendBoxClick; - private void ShowMaximize(bool IsOnMoving = false) + private void ShowMaximize() { Screen screen = Screen.FromPoint(MousePosition); base.MaximumSize = ShowFullScreen ? screen.Bounds.Size : screen.WorkingArea.Size; @@ -325,6 +326,7 @@ namespace Sunny.UI if (InControlBox || InMaxBox || InMinBox || InExtendBox) return; if (!ShowTitle) return; if (e.Y > Padding.Top) return; + if (e.Y == 0) return; ShowMaximize(); } @@ -364,9 +366,9 @@ namespace Sunny.UI { //int screenIndex = GetMouseInScreen(PointToScreen(e.Location)); Screen screen = Screen.FromPoint(MousePosition); - if (MousePosition.Y == screen.WorkingArea.Top && MaximizeBox) + if (MousePosition.Y == screen.WorkingArea.Top && MaximizeBox && WindowState == FormWindowState.Normal) { - ShowMaximize(true); + ShowMaximize(); } // 防止窗体上移时标题栏超出容器，导致后续无法移动