zhaoyushun1999/SunnyUI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* UIForm: 最大化后，鼠标单击标题栏最上方，不恢复正常大小

Browse Source
This commit is contained in:
Sunny 2024-07-28 23:39:19 +08:00
parent fcd8b00784
commit 073f4cb22c
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
SunnyUI/Forms/UIForm.cs
View File

@ -60,6 +60,7 @@
* 2024-06-08: V3.6.6 防止图标转换错误 * 2024-06-08: V3.6.6 防止图标转换错误
* 2024-07-20: V3.6.8 修改为初始化最大化后恢复时界面尺寸大小正常 * 2024-07-20: V3.6.8 修改为初始化最大化后恢复时界面尺寸大小正常
* 2024-07-26: V3.6.8 修复鼠标点击事件 * 2024-07-26: V3.6.8 修复鼠标点击事件
* 2024-07-28: V3.6.8 最大化后，鼠标点击标题栏最上方，不恢复正常大小
******************************************************************************/ ******************************************************************************/
using System; using System;
@ -260,7 +261,7 @@ namespace Sunny.UI
public event EventHandler ExtendBoxClick; public event EventHandler ExtendBoxClick;
private void ShowMaximize(bool IsOnMoving = false) private void ShowMaximize()
{ {
Screen screen = Screen.FromPoint(MousePosition); Screen screen = Screen.FromPoint(MousePosition);
base.MaximumSize = ShowFullScreen ? screen.Bounds.Size : screen.WorkingArea.Size; base.MaximumSize = ShowFullScreen ? screen.Bounds.Size : screen.WorkingArea.Size;
@ -325,6 +326,7 @@ namespace Sunny.UI
if (InControlBox || InMaxBox || InMinBox || InExtendBox) return; if (InControlBox || InMaxBox || InMinBox || InExtendBox) return;
if (!ShowTitle) return; if (!ShowTitle) return;
if (e.Y > Padding.Top) return; if (e.Y > Padding.Top) return;
if (e.Y == 0) return;
ShowMaximize(); ShowMaximize();
} }
@ -364,9 +366,9 @@ namespace Sunny.UI
{ {
//int screenIndex = GetMouseInScreen(PointToScreen(e.Location)); //int screenIndex = GetMouseInScreen(PointToScreen(e.Location));
Screen screen = Screen.FromPoint(MousePosition); 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();
} }
// 防止窗体上移时标题栏超出容器，导致后续无法移动 // 防止窗体上移时标题栏超出容器，导致后续无法移动