From 651240ca599ffaaeeeed5c3fb75cd775cfb4d5eb Mon Sep 17 00:00:00 2001 From: Sunny Date: Fri, 24 Feb 2023 17:46:31 +0800 Subject: [PATCH] =?UTF-8?q?*=20UIPage:=20=E5=8F=96=E6=B6=88=E8=AE=BE?= =?UTF-8?q?=E8=AE=A1=E6=9C=9F=E7=9A=84Dock.Fill=EF=BC=8C=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E8=BF=90=E8=A1=8C=E6=97=B6=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SunnyUI/Controls/UINavMenuHelper.cs | 1 + SunnyUI/Frames/UIPage.cs | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/SunnyUI/Controls/UINavMenuHelper.cs b/SunnyUI/Controls/UINavMenuHelper.cs index 7527da86..da5eee37 100644 --- a/SunnyUI/Controls/UINavMenuHelper.cs +++ b/SunnyUI/Controls/UINavMenuHelper.cs @@ -254,6 +254,7 @@ namespace Sunny.UI } TabPage tabPage = CreateTabIfNotExists(new NavMenuItem(page)); + page.Dock = DockStyle.Fill; page.TabPage = tabPage; tabPage.Controls.Add(page); tabPage.Text = page.Text; diff --git a/SunnyUI/Frames/UIPage.cs b/SunnyUI/Frames/UIPage.cs index 1bc3fff7..23486f58 100644 --- a/SunnyUI/Frames/UIPage.cs +++ b/SunnyUI/Frames/UIPage.cs @@ -34,6 +34,7 @@ * 2022-08-25: V3.2.3 重构多页面框架传值:接收框架、页面传值 ReceiveParams 事件 * 2022-10-28: V3.2.6 标题栏增加扩展按钮 * 2023-02-24: V3.3.2 增加PageDeselecting,取消页面选择时增加判断 + * 2023-02-24: V3.3.2 取消设计期的Dock.Fill,改为运行时设置 ******************************************************************************/ using System; @@ -88,7 +89,7 @@ namespace Sunny.UI SetStyle(ControlStyles.DoubleBuffer, true); UpdateStyles(); - if (!IsDesignMode) base.Dock = DockStyle.Fill; + //if (!IsDesignMode) base.Dock = DockStyle.Fill; Version = UIGlobal.Version; SetDPIScale();