ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-01-11 15:33:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://10.6.6.2/zerotier/ZeroTierOne into dev

Browse Source
This commit is contained in:
Adam Ierymenko 2017-01-09 15:55:13 -08:00
commit ef7faa7291
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
windows/WinUI/ToolbarItem.xaml.cs
View File

@ -138,6 +138,8 @@ namespace WinUI
netListLocation.X = netListView.Left; netListLocation.X = netListView.Left;
netListLocation.Y = netListView.Top; netListLocation.Y = netListView.Top;
} }
netListView.Activate();
} }
private void ShowNetworksClosed(object sender, System.EventArgs e) private void ShowNetworksClosed(object sender, System.EventArgs e)
@ -169,6 +171,10 @@ namespace WinUI
joinNetLocation.Y = joinNetView.Top; joinNetLocation.Y = joinNetView.Top;
} }
} }
else
{
joinNetView.Activate();
}
} }
private void JoinNetworkClosed(object sender, System.EventArgs e) private void JoinNetworkClosed(object sender, System.EventArgs e)
@ -200,6 +206,10 @@ namespace WinUI
aboutViewLocation.Y = aboutView.Top; aboutViewLocation.Y = aboutView.Top;
} }
} }
else
{
aboutView.Activate();
}
} }
private void AboutClosed(object sender, System.EventArgs e) private void AboutClosed(object sender, System.EventArgs e)
@ -231,6 +241,10 @@ namespace WinUI
prefsViewLocation.Y = prefsView.Top; prefsViewLocation.Y = prefsView.Top;
} }
} }
else
{
prefsView.Activate();
}
} }
private void PreferencesClosed(object sender, System.EventArgs e) private void PreferencesClosed(object sender, System.EventArgs e)