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

* UITabControl: 修改删除页面时的页面跳转

Browse Source
This commit is contained in:
Sunny 2022-01-13 22:50:35 +08:00
parent 4709f2be8e
commit ce29048f92
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Bin/net40/SunnyUI.dll
View File

Binary file not shown.

16
SunnyUI/Controls/UITabControl.cs
View File

@ -24,6 +24,7 @@
* 2021-07-14: V3.0.5 支持Tab在下方显示 * 2021-07-14: V3.0.5 支持Tab在下方显示
* 2021-08-14: V3.0.6 增加DisposeTabPageAfterRemove标志，移除TabPage后，是否自动销毁TabPage * 2021-08-14: V3.0.6 增加DisposeTabPageAfterRemove标志，移除TabPage后，是否自动销毁TabPage
* 2022-01-02: V3.0.9 增加角标 * 2022-01-02: V3.0.9 增加角标
* 2022-01-13: V3.1.0 修改删除页面时的页面跳转
******************************************************************************/ ******************************************************************************/
using Sunny.UI.Win32; using Sunny.UI.Win32;
@ -62,6 +63,8 @@ namespace Sunny.UI
timer = new Timer(); timer = new Timer();
timer.Interval = 500; timer.Interval = 500;
timer.Tick += Timer_Tick; timer.Tick += Timer_Tick;
DisposeTabPageAfterRemove = true;
} }
private ConcurrentDictionary<TabPage, string> TipsTexts = new ConcurrentDictionary<TabPage, string>(); private ConcurrentDictionary<TabPage, string> TipsTexts = new ConcurrentDictionary<TabPage, string>();
@ -696,7 +699,7 @@ namespace Sunny.UI
get; set; get; set;
} }
[DefaultValue(false)] [DefaultValue(true)]
[Description("移除TabPage后，是否自动销毁TabPage"), Category("SunnyUI")] [Description("移除TabPage后，是否自动销毁TabPage"), Category("SunnyUI")]
public bool DisposeTabPageAfterRemove public bool DisposeTabPageAfterRemove
{ {
@ -723,14 +726,15 @@ namespace Sunny.UI
} }
} }
SelectedTab = TabPages[index > 0 ? index - 1 : 0];
TabPages.Remove(tabPage); TabPages.Remove(tabPage);
AfterRemoveTabPage?.Invoke(this, index); AfterRemoveTabPage?.Invoke(this, index);
if (TabCount > 0) //if (TabCount > 0)
{ //{
if (index == 0) SelectedIndex = 0; // if (index == 0) SelectedIndex = 0;
if (index > 0) SelectedIndex = index - 1; // if (index > 0) SelectedIndex = index - 1;
} //}
if (DisposeTabPageAfterRemove) tabPage.Dispose(); if (DisposeTabPageAfterRemove) tabPage.Dispose();
} }