zhaoyushun1999/SunnyUI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* UIPage: 调整了页面切换时Final和Init的顺序

Browse Source
This commit is contained in:
Sunny 2023-03-11 12:04:54 +08:00
parent 42e6b8e67e
commit b3f06c240a
3 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
SunnyUI/Controls/UITabControl.cs
View File

@ -927,7 +927,7 @@ namespace Sunny.UI
timer?.Start();
}
private int LastIndex;
//private int LastIndex;
public void Init()
{
@ -939,19 +939,19 @@ namespace Sunny.UI
if (SelectedIndex >= 0)
{
List<UIPage> pages;
if (LastIndex != SelectedIndex)
{
if (LastIndex >= 0 && TabPages.Count > 0 && LastIndex < TabPages.Count)
{
pages = TabPages[LastIndex].GetControls<UIPage>();
foreach (var page in pages)
{
page.Final();
}
}
LastIndex = SelectedIndex;
}
//if (LastIndex != SelectedIndex)
//{
// if (LastIndex >= 0 && TabPages.Count > 0 && LastIndex < TabPages.Count)
// {
// pages = TabPages[LastIndex].GetControls<UIPage>();
// foreach (var page in pages)
// {
// page.Final();
// }
// }
//
// LastIndex = SelectedIndex;
//}
pages = TabPages[SelectedIndex].GetControls<UIPage>();
foreach (var page in pages)

3
SunnyUI/Forms/UIForm.cs
View File

@ -2168,6 +2168,9 @@ namespace Sunny.UI
private void MainTabControl_Selecting(object sender, TabControlCancelEventArgs e)
{
if (SelectedPage != null)
SelectedPage.Final();
List<UIPage> pages = e.TabPage.GetControls<UIPage>();
if (pages.Count == 1)
{

1
SunnyUI/Frames/UIPage.cs
View File

@ -516,7 +516,6 @@ namespace Sunny.UI
}
}
/// <summary>
/// 字体颜色
/// </summary>