CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-07-04 22:21:23 +12:00
Code Issues Packages Projects Releases Wiki Activity

TabToTreeView refactor

Browse source
This commit is contained in:
Jaex 2020-02-08 20:57:44 +03:00
parent a3174356a3
commit d45fffe56d
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ShareX.HelpersLib/Controls/TabToTreeView.cs
View file

@ -148,25 +148,23 @@ private void tvMain_AfterSelect(object sender, TreeViewEventArgs e)
{ {
if (AutoSelectChild && tabPage.Controls.Count == 1 && tabPage.Controls[0] is TabControl) if (AutoSelectChild && tabPage.Controls.Count == 1 && tabPage.Controls[0] is TabControl)
{ {
SelectChild(); SelectChildNode();
} }
else else
{ {
SelectTab(tabPage); SelectTabPage(tabPage);
} }
} }
} }
private void SelectTab(TabPage tabPage) private void SelectTabPage(TabPage tabPage)
{ {
if (tabPage != null) if (tabPage != null)
{ {
tvMain.BeginUpdate();
tcMain.Visible = true; tcMain.Visible = true;
tcMain.TabPages.Clear(); tcMain.TabPages.Clear();
tcMain.TabPages.Add(tabPage); tcMain.TabPages.Add(tabPage);
tvMain.Focus(); tvMain.Focus();
tvMain.EndUpdate();
OnTabChanged(tabPage); OnTabChanged(tabPage);
} }
@ -189,11 +187,13 @@ public void NavigateToTabPage(TabPage tabPage)
} }
} }
public void SelectChild() public void SelectChildNode()
{ {
if (tvMain.SelectedNode.Nodes.Count > 0) TreeNode node = tvMain.SelectedNode;
if (node != null && node.Nodes.Count > 0)
{ {
tvMain.SelectedNode = tvMain.SelectedNode.Nodes[0]; tvMain.SelectedNode = node.Nodes[0];
} }
} }

2
ShareX/Forms/TaskSettingsForm.cs
View file

@ -415,7 +415,7 @@ private void tttvMain_TabChanged(TabPage tabPage)
{ {
if (IsDefault && tabPage == tpUploadMain) if (IsDefault && tabPage == tpUploadMain)
{ {
tttvMain.SelectChild(); tttvMain.SelectChildNode();
} }
} }