From 9a2acbdf7039f677478eb0d5af4afa0215621875 Mon Sep 17 00:00:00 2001 From: Sunny Date: Sun, 28 May 2023 17:05:17 +0800 Subject: [PATCH] =?UTF-8?q?*=20=E9=87=8D=E6=9E=84=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E6=8E=A7=E4=BB=B6=E7=9A=84Dispose=E4=BA=8B=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SunnyUI/Controls/UIImageListBox.cs | 7 +++++++ SunnyUI/Controls/UIListBox.cs | 3 +++ SunnyUI/Controls/UITreeView.cs | 3 ++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/SunnyUI/Controls/UIImageListBox.cs b/SunnyUI/Controls/UIImageListBox.cs index d76e7fa7..117b5045 100644 --- a/SunnyUI/Controls/UIImageListBox.cs +++ b/SunnyUI/Controls/UIImageListBox.cs @@ -80,6 +80,13 @@ namespace Sunny.UI listbox.DrawItem += Listbox_DrawItem; } + protected override void Dispose(bool disposing) + { + base.Dispose(disposing); + bar?.Dispose(); + listbox?.Dispose(); + } + private int scrollBarWidth = 0; [DefaultValue(0), Category("SunnyUI"), Description("垂直滚动条宽度,最小为原生滚动条宽度")] diff --git a/SunnyUI/Controls/UIListBox.cs b/SunnyUI/Controls/UIListBox.cs index 3f28b1f5..0cd0c3ec 100644 --- a/SunnyUI/Controls/UIListBox.cs +++ b/SunnyUI/Controls/UIListBox.cs @@ -180,6 +180,9 @@ namespace Sunny.UI base.Dispose(disposing); timer?.Stop(); timer?.Dispose(); + + bar?.Dispose(); + listbox?.Dispose(); } public new event EventHandler MouseLeave; diff --git a/SunnyUI/Controls/UITreeView.cs b/SunnyUI/Controls/UITreeView.cs index bf7fdfb7..66882e82 100644 --- a/SunnyUI/Controls/UITreeView.cs +++ b/SunnyUI/Controls/UITreeView.cs @@ -94,8 +94,9 @@ namespace Sunny.UI view.MouseClick += View_MouseClick; } - ~UITreeView() + protected override void Dispose(bool disposing) { + base.Dispose(disposing); view?.Dispose(); Bar?.Dispose(); HBar?.Dispose();