Learning/mRemoteNG
1
0
Fork 0
mirror of https://github.com/mRemoteNG/mRemoteNG.git synced 2026-02-17 22:11:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix toolbar location loading bug

Browse Source
This commit is contained in:
David Sparer
2018-02-01 20:34:22 -06:00
parent 49121fb945
commit 2e82551b7c
1 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
mRemoteV1/Config/Settings/SettingsLoader.cs
View File

@@ -196,22 +196,36 @@ namespace mRemoteNG.Config.Settings
private void LoadToolbarsFromSettings()
{
AddExternalAppsPanel();
ResetAllToolbarLocations();
AddExternalAppsPanel();
AddQuickConnectPanel();
AddMultiSshPanel();
// if (mRemoteNG.Settings.Default.QuickyTBLocation.X > mRemoteNG.Settings.Default.ExtAppsTBLocation.X)
//{
// AddExternalAppsPanel();
// AddQuickConnectPanel();
//}
//else
//{
// AddQuickConnectPanel();
// AddExternalAppsPanel();
//}
}
// if (mRemoteNG.Settings.Default.QuickyTBLocation.X > mRemoteNG.Settings.Default.ExtAppsTBLocation.X)
//{
// AddExternalAppsPanel();
// AddQuickConnectPanel();
//}
//else
//{
// AddQuickConnectPanel();
// AddExternalAppsPanel();
//}
}
/// <summary>
/// This prevents odd positioning issues due to toolbar load order.
/// Since all toolbars start in this temp panel, no toolbar load
/// can be blocked by pre-existing toolbars.
/// </summary>
private void ResetAllToolbarLocations()
{
var tempToolStrip = new ToolStripPanel();
tempToolStrip.Join(_quickConnectToolStrip);
tempToolStrip.Join(_externalToolsToolStrip);
tempToolStrip.Join(_multiSshToolStrip);
}
private void AddQuickConnectPanel()
{
var toolStripPanel = ToolStripPanelFromString(mRemoteNG.Settings.Default.QuickyTBParentDock);