From 436a34fd6b13a11f40fff490af9d0b1c70d2d283 Mon Sep 17 00:00:00 2001
From: Sunny <yhuse@163.com>
Date: Mon, 24 Jul 2023 11:14:42 +0800
Subject: [PATCH] =?UTF-8?q?*=20UIForm:=20=E4=BF=AE=E5=A4=8D=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=88=87=E6=8D=A2=E6=97=B6=EF=BC=8C=E7=AC=AC=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AAUIPage=E6=9C=AA=E6=89=A7=E8=A1=8CFinal=E4=BA=8B?=
 =?UTF-8?q?=E4=BB=B6=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SunnyUI/Forms/UIForm.cs | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/SunnyUI/Forms/UIForm.cs b/SunnyUI/Forms/UIForm.cs
index a70971d3..5ae9fdff 100644
--- a/SunnyUI/Forms/UIForm.cs
+++ b/SunnyUI/Forms/UIForm.cs
@@ -46,6 +46,7 @@
  * 2023-01-25: V3.3.1 最大化后，关闭按钮扩大至原按钮右上角全部区域
  * 2023-02-24: V3.3.2 修复PageSelected可能未显示选中页面的问题
  * 2023-05-12: V3.3.6 重构DrawString函数
+ * 2023-07-24: V3.4.1 修复页面切换时，第一个UIPage未执行Final事件的问题
 ******************************************************************************/
 
 using System;
@@ -2169,6 +2170,25 @@ namespace Sunny.UI
                 mainTabControl.PageAdded += DealPageAdded;
                 mainTabControl.PageRemoved += DealPageRemoved;
                 mainTabControl.Selecting += MainTabControl_Selecting;
+                mainTabControl.VisibleChanged += MainTabControl_VisibleChanged;
+            }
+        }
+
+        private void MainTabControl_VisibleChanged(object sender, EventArgs e)
+        {
+            if (SelectedPage == null)
+            {
+                List<UIPage> pages = mainTabControl.SelectedTab.GetControls<UIPage>();
+                if (pages.Count == 1)
+                {
+                    SelectedPage = pages[0];
+                    PageSelected?.Invoke(this, new UIPageEventArgs(SelectedPage));
+                }
+                else
+                {
+                    SelectedPage = null;
+                    PageSelected?.Invoke(this, new UIPageEventArgs(SelectedPage));
+                }
             }
         }