From b7fc97c9189009730f7752b35da84883e1732f39 Mon Sep 17 00:00:00 2001
From: Sunny <yhuse@163.com>
Date: Tue, 16 Apr 2024 14:46:28 +0800
Subject: [PATCH] =?UTF-8?q?*=20UIForm2:=20=E8=AE=BE=E7=BD=AE=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4Padding.Top=E4=B8=BATitleHeight?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SunnyUI/Forms/UIForm2.cs | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/SunnyUI/Forms/UIForm2.cs b/SunnyUI/Forms/UIForm2.cs
index 83d8c492..fed4865a 100644
--- a/SunnyUI/Forms/UIForm2.cs
+++ b/SunnyUI/Forms/UIForm2.cs
@@ -18,6 +18,7 @@
  *
  * 2024-01-20: V3.6.3 增加文件说明
  * 2024-01-25: V3.6.3 增加主题等
+ * 2024-04-16: V3.6.5 设置默认Padding.Top为TitleHeight
 ******************************************************************************/
 
 using System;
@@ -1235,6 +1236,7 @@ namespace Sunny.UI
 
             if (AutoScaleMode == AutoScaleMode.Font) AutoScaleMode = AutoScaleMode.None;
             if (base.BackColor == SystemColors.Control) base.BackColor = UIStyles.Blue.PageBackColor;
+            SetPadding();
 
             Render();
             CalcSystemBoxPos();
@@ -1816,14 +1818,19 @@ namespace Sunny.UI
             set
             {
                 showDragStretch = value;
-                if (value)
-                {
-                    Padding = new Padding(Math.Max(Padding.Left, 2), showTitle ? TitleHeight + 1 : 2, Math.Max(Padding.Right, 2), Math.Max(Padding.Bottom, 2));
-                }
-                else
-                {
-                    Padding = new Padding(0, showTitle ? TitleHeight : 0, 0, 0);
-                }
+                SetPadding();
+            }
+        }
+
+        private void SetPadding()
+        {
+            if (showDragStretch)
+            {
+                Padding = new Padding(Math.Max(Padding.Left, 2), showTitle ? TitleHeight + 1 : 2, Math.Max(Padding.Right, 2), Math.Max(Padding.Bottom, 2));
+            }
+            else
+            {
+                Padding = new Padding(0, showTitle ? TitleHeight : 0, 0, 0);
             }
         }