diff --git a/SunnyUI/Controls/UITitlePanel.Designer.cs b/SunnyUI/Controls/UITitlePanel.Designer.cs index 3c1aea9b..2ad3b364 100644 --- a/SunnyUI/Controls/UITitlePanel.Designer.cs +++ b/SunnyUI/Controls/UITitlePanel.Designer.cs @@ -28,14 +28,13 @@ /// private void InitializeComponent() { - this.SuspendLayout(); + SuspendLayout(); // // UITitlePanel // - this.Name = "UITitlePanel"; - this.Padding = new System.Windows.Forms.Padding(0, 35, 0, 0); - this.ResumeLayout(false); - + Name = "UITitlePanel"; + VisibleChanged += UITitlePanel_VisibleChanged; + ResumeLayout(false); } #endregion diff --git a/SunnyUI/Controls/UITitlePanel.cs b/SunnyUI/Controls/UITitlePanel.cs index d0086810..1eebb49f 100644 --- a/SunnyUI/Controls/UITitlePanel.cs +++ b/SunnyUI/Controls/UITitlePanel.cs @@ -25,6 +25,7 @@ * 2023-05-02: V3.3.6 增加了一个关闭按钮的属性,点击后隐藏控件 * 2023-05-12: V3.3.6 标题栏文字位置属性由TextAlign改为TextAlignment * 2023-05-12: V3.3.6 重构DrawString函数 + * 2023-07-12: V3.4.0 删除Padding设置 ******************************************************************************/ using System; @@ -50,32 +51,12 @@ namespace Sunny.UI if (_titleHeight != value) { _titleHeight = Math.Max(19, value); - Padding = new Padding(Padding.Left, Math.Max(value, Padding.Top), Padding.Right, Padding.Bottom); CalcSystemBoxPos(); Invalidate(); } } } - protected override void OnPaddingChanged(EventArgs e) - { - base.OnPaddingChanged(e); - if (Padding.Top != Math.Max(TitleHeight, Padding.Top)) - { - Padding = new Padding(Padding.Left, Math.Max(TitleHeight, Padding.Top), Padding.Right, Padding.Bottom); - } - } - - protected override void OnControlAdded(ControlEventArgs e) - { - base.OnControlAdded(e); - - if (e.Control.Top < TitleHeight) - { - e.Control.Top = TitleHeight + 1; - } - } - public UITitlePanel() { InitializeComponent(); @@ -390,5 +371,16 @@ namespace Sunny.UI base.OnMouseDoubleClick(e); } + + private void UITitlePanel_VisibleChanged(object sender, EventArgs e) + { + foreach (Control control in Controls) + { + if (control.Top < TitleHeight) + { + control.Top = TitleHeight + 1; + } + } + } } } \ No newline at end of file diff --git a/SunnyUI/Controls/UITitlePanel.resx b/SunnyUI/Controls/UITitlePanel.resx index 1af7de15..a395bffc 100644 --- a/SunnyUI/Controls/UITitlePanel.resx +++ b/SunnyUI/Controls/UITitlePanel.resx @@ -1,24 +1,24 @@  -