From 88d551b5e3821e1c41c493a43fc052c2eba853eb Mon Sep 17 00:00:00 2001
From: Sunny <yhuse@163.com>
Date: Mon, 25 Jul 2022 16:53:27 +0800
Subject: [PATCH] =?UTF-8?q?*=20UIForm:=20=E5=A4=9A=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=A1=86=E6=9E=B6=E5=A2=9E=E5=8A=A0=E7=A8=8B=E5=BA=8F=E5=85=B3?=
 =?UTF-8?q?=E9=97=AD=E6=97=B6=E8=B0=83=E7=94=A8UIPage=E7=9A=84Final?=
 =?UTF-8?q?=E5=92=8CFormClosed=E4=BA=8B=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SunnyUI/Controls/UIGifAvatar.cs |  3 +++
 SunnyUI/Forms/UIForm.cs         | 16 ++++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/SunnyUI/Controls/UIGifAvatar.cs b/SunnyUI/Controls/UIGifAvatar.cs
index 29c9cbff..35ca1290 100644
--- a/SunnyUI/Controls/UIGifAvatar.cs
+++ b/SunnyUI/Controls/UIGifAvatar.cs
@@ -20,6 +20,7 @@
 ******************************************************************************/
 
 using System;
+using System.Collections.Concurrent;
 using System.ComponentModel;
 using System.Drawing;
 using System.Drawing.Imaging;
@@ -131,6 +132,8 @@ namespace Sunny.UI
             }
         }
 
+        private ConcurrentDictionary<int, Image> Images = new ConcurrentDictionary<int, Image>();
+
         private int avatarSize = 120;
 
         [DefaultValue(120), Description("头像大小"), Category("SunnyUI")]
diff --git a/SunnyUI/Forms/UIForm.cs b/SunnyUI/Forms/UIForm.cs
index 675a1ac0..fa64285e 100644
--- a/SunnyUI/Forms/UIForm.cs
+++ b/SunnyUI/Forms/UIForm.cs
@@ -37,6 +37,7 @@
  * 2022-06-11: V3.1.9 弹窗默认关闭半透明遮罩
  * 2022-07-05: V3.2.1 多页面框架增加PageAdded，PageSelected，PageRemoved事件
  * 2022-07-14: V3.2.1 增加UnRegisterHotKey，卸载全局热键
+ * 2022-07-25: V3.2.2 多页面框架增加程序关闭时调用UIPage的Final和FormClosed事件
 ******************************************************************************/
 
 using System;
@@ -1625,6 +1626,21 @@ namespace Sunny.UI
             }
         }
 
+        protected override void OnFormClosed(FormClosedEventArgs e)
+        {
+            base.OnFormClosed(e);
+
+            if (MainTabControl != null)
+            {
+                foreach (var item in MainTabControl.GetControls<UIPage>(true))
+                {
+                    item.Final();
+                    item.Close();
+                    item.Dispose();
+                }
+            }
+        }
+
         [Description("文字对齐方式"), Category("SunnyUI")]
         public StringAlignment TextAlignment
         {