From 3acba1ca26033915717fe1f31a5790c9fd15d5b4 Mon Sep 17 00:00:00 2001 From: Sunny Date: Sun, 28 May 2023 15:41:53 +0800 Subject: [PATCH] =?UTF-8?q?*=20=E9=87=8D=E6=9E=84=E5=AD=97=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SunnyUI/Common/UMessageTip.cs | 2 ++ SunnyUI/Controls/DropItem/UIDropControl.Designer.cs | 1 + SunnyUI/Controls/DropItem/UIDropControl.cs | 2 +- SunnyUI/Controls/UIDataGridViewFooter.cs | 3 +-- SunnyUI/Controls/UILabel.cs | 2 +- SunnyUI/Controls/UIListBoxEx.cs | 2 +- SunnyUI/Controls/UINavBar.cs | 2 +- SunnyUI/Controls/UINavMenu.cs | 2 +- SunnyUI/Controls/UIRichTextBox.cs | 6 ++++++ SunnyUI/Controls/UITabControl.cs | 2 +- SunnyUI/Controls/UITabControlMenu.cs | 2 +- SunnyUI/Controls/UITextBox.Designer.cs | 4 ++++ SunnyUI/Controls/UITextBox.cs | 1 - SunnyUI/Controls/UITreeView.cs | 7 +++++++ 14 files changed, 28 insertions(+), 10 deletions(-) diff --git a/SunnyUI/Common/UMessageTip.cs b/SunnyUI/Common/UMessageTip.cs index 82d7965c..7f7ff2ca 100644 --- a/SunnyUI/Common/UMessageTip.cs +++ b/SunnyUI/Common/UMessageTip.cs @@ -48,6 +48,7 @@ namespace Sunny.UI { //默认字体。当样式中的Font==null时用该字体替换 static readonly Font DefaultFont = UIStyles.Font(); + //文本格式。用于测量和绘制 static readonly StringFormat DefStringFormat = StringFormat.GenericTypographic; @@ -178,6 +179,7 @@ namespace Sunny.UI { throw new ArgumentNullException(nameof(controlOrItem)); } + Show(text, style, delay, floating, GetCenterPosition(controlOrItem), centerInControl ?? IsContainerLike(controlOrItem)); } diff --git a/SunnyUI/Controls/DropItem/UIDropControl.Designer.cs b/SunnyUI/Controls/DropItem/UIDropControl.Designer.cs index 9fbebfa6..a0c6cc4d 100644 --- a/SunnyUI/Controls/DropItem/UIDropControl.Designer.cs +++ b/SunnyUI/Controls/DropItem/UIDropControl.Designer.cs @@ -19,6 +19,7 @@ components.Dispose(); } + edit?.Dispose(); ItemForm?.Dispose(); base.Dispose(disposing); } diff --git a/SunnyUI/Controls/DropItem/UIDropControl.cs b/SunnyUI/Controls/DropItem/UIDropControl.cs index 1ddaa6a2..a44e9b3d 100644 --- a/SunnyUI/Controls/DropItem/UIDropControl.cs +++ b/SunnyUI/Controls/DropItem/UIDropControl.cs @@ -45,7 +45,7 @@ namespace Sunny.UI Padding = new Padding(0, 0, 30, 2); edit.AutoSize = false; - edit.Font = UIStyles.Font(); + //edit.Font = UIStyles.Font(); edit.Left = 4; edit.Top = 3; edit.Text = String.Empty; diff --git a/SunnyUI/Controls/UIDataGridViewFooter.cs b/SunnyUI/Controls/UIDataGridViewFooter.cs index 50908b2c..9f49e349 100644 --- a/SunnyUI/Controls/UIDataGridViewFooter.cs +++ b/SunnyUI/Controls/UIDataGridViewFooter.cs @@ -39,8 +39,7 @@ namespace Sunny.UI SetStyleFlags(true, false, true); Height = 29; RadiusSides = UICornerRadiusSides.None; - - Font = UIStyles.Font(); + //Font = UIStyles.Font(); foreColor = UIStyles.Blue.DataGridViewFooterForeColor; fillColor = UIStyles.Blue.PlainColor; rectColor = UIStyles.Blue.RectColor; diff --git a/SunnyUI/Controls/UILabel.cs b/SunnyUI/Controls/UILabel.cs index 3e62cd85..5349a260 100644 --- a/SunnyUI/Controls/UILabel.cs +++ b/SunnyUI/Controls/UILabel.cs @@ -181,7 +181,7 @@ namespace Sunny.UI { public UILinkLabel() { - Font = UIStyles.Font(); + base.Font = UIStyles.Font(); LinkBehavior = LinkBehavior.AlwaysUnderline; Version = UIGlobal.Version; diff --git a/SunnyUI/Controls/UIListBoxEx.cs b/SunnyUI/Controls/UIListBoxEx.cs index 24cafacb..9e7eb177 100644 --- a/SunnyUI/Controls/UIListBoxEx.cs +++ b/SunnyUI/Controls/UIListBoxEx.cs @@ -191,7 +191,7 @@ namespace Sunny.UI // BorderStyle = BorderStyle.FixedSingle; DrawMode = DrawMode.OwnerDrawFixed; - Font = UIStyles.Font(); + base.Font = UIStyles.Font(); IntegralHeight = false; ItemHeight = 25; Size = new Size(150, 200); diff --git a/SunnyUI/Controls/UINavBar.cs b/SunnyUI/Controls/UINavBar.cs index 7424987f..26da6c4d 100644 --- a/SunnyUI/Controls/UINavBar.cs +++ b/SunnyUI/Controls/UINavBar.cs @@ -56,7 +56,7 @@ namespace Sunny.UI DoubleBuffered = true; UpdateStyles(); - Font = UIStyles.Font(); + base.Font = UIStyles.Font(); NavBarMenu.VisibleChanged += NavBarMenu_VisibleChanged; Dock = DockStyle.Top; diff --git a/SunnyUI/Controls/UINavMenu.cs b/SunnyUI/Controls/UINavMenu.cs index c31ecd83..94af8133 100644 --- a/SunnyUI/Controls/UINavMenu.cs +++ b/SunnyUI/Controls/UINavMenu.cs @@ -72,7 +72,7 @@ namespace Sunny.UI //ShowRootLines = false; DoubleBuffered = true; - Font = UIStyles.Font(); + base.Font = UIStyles.Font(); //CheckBoxes = false; ItemHeight = 50; BackColor = Color.FromArgb(56, 56, 56); diff --git a/SunnyUI/Controls/UIRichTextBox.cs b/SunnyUI/Controls/UIRichTextBox.cs index e3a23b85..e489c649 100644 --- a/SunnyUI/Controls/UIRichTextBox.cs +++ b/SunnyUI/Controls/UIRichTextBox.cs @@ -84,6 +84,12 @@ namespace Sunny.UI edit.MouseMove += Edit_MouseMove; } + ~UIRichTextBox() + { + edit?.Dispose(); + bar?.Dispose(); + } + public new event EventHandler Leave; public new event EventHandler Validated; public new event CancelEventHandler Validating; diff --git a/SunnyUI/Controls/UITabControl.cs b/SunnyUI/Controls/UITabControl.cs index 77801bbb..f38e240e 100644 --- a/SunnyUI/Controls/UITabControl.cs +++ b/SunnyUI/Controls/UITabControl.cs @@ -61,7 +61,7 @@ namespace Sunny.UI ItemSize = new Size(150, 40); DrawMode = TabDrawMode.OwnerDrawFixed; - Font = UIStyles.Font(); + base.Font = UIStyles.Font(); AfterSetFillColor(FillColor); Version = UIGlobal.Version; diff --git a/SunnyUI/Controls/UITabControlMenu.cs b/SunnyUI/Controls/UITabControlMenu.cs index 7da7c979..24af3134 100644 --- a/SunnyUI/Controls/UITabControlMenu.cs +++ b/SunnyUI/Controls/UITabControlMenu.cs @@ -42,7 +42,7 @@ namespace Sunny.UI base.ItemSize = new Size(40, 200); DrawMode = TabDrawMode.OwnerDrawFixed; - Font = UIStyles.Font(); + base.Font = UIStyles.Font(); AfterSetFillColor(FillColor); Size = new Size(450, 270); Version = UIGlobal.Version; diff --git a/SunnyUI/Controls/UITextBox.Designer.cs b/SunnyUI/Controls/UITextBox.Designer.cs index e70dd4cc..77a14052 100644 --- a/SunnyUI/Controls/UITextBox.Designer.cs +++ b/SunnyUI/Controls/UITextBox.Designer.cs @@ -18,6 +18,10 @@ CloseTips(); components.Dispose(); } + + edit?.Dispose(); + bar?.Dispose(); + btn?.Dispose(); base.Dispose(disposing); } diff --git a/SunnyUI/Controls/UITextBox.cs b/SunnyUI/Controls/UITextBox.cs index bba5fc67..f660413e 100644 --- a/SunnyUI/Controls/UITextBox.cs +++ b/SunnyUI/Controls/UITextBox.cs @@ -72,7 +72,6 @@ namespace Sunny.UI SetStyleFlags(true, true, true); ShowText = false; - Font = UIStyles.Font(); MinimumSize = new Size(1, 16); Width = 150; diff --git a/SunnyUI/Controls/UITreeView.cs b/SunnyUI/Controls/UITreeView.cs index 18ea1e00..bf7fdfb7 100644 --- a/SunnyUI/Controls/UITreeView.cs +++ b/SunnyUI/Controls/UITreeView.cs @@ -94,6 +94,13 @@ namespace Sunny.UI view.MouseClick += View_MouseClick; } + ~UITreeView() + { + view?.Dispose(); + Bar?.Dispose(); + HBar?.Dispose(); + } + public event NodeLabelEditEventHandler AfterLabelEdit; public new event EventHandler MouseLeave; public new event EventHandler MouseEnter;