diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs index fce1725c9d..a4f90146ae 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs @@ -1392,23 +1392,34 @@ namespace BizHawk.Client.EmuHawk } } - ColumnsSubMenu.DropDownItems.Add(new ToolStripSeparator()); - var defaults = new ToolStripMenuItem - { - Name = "RestoreDefaultColumnConfiguration", - Text = "Restore defaults" - }; + TasView.AllColumns.ColumnsChanged(); + } - defaults.Click += (o, ev) => - { - TasView.AllColumns.Clear(); + [RestoreDefaults] + private void RestoreDefaults() + { + TasView.AllColumns.Clear(); SetUpColumns(); RefreshTasView(); CurrentTasMovie.FlagChanges(); - }; - ColumnsSubMenu.DropDownItems.Add(defaults); - TasView.AllColumns.ColumnsChanged(); + try + { + MainVertialSplit.SplitterDistance = Settings.MainVerticalSplitDistance; + } + catch (Exception) + { + MainVertialSplit.SplitterDistance = _defaultMainSplitDistance; + } + + try + { + BranchesMarkersSplit.SplitterDistance = Settings.BranchMarkerSplitDistance; + } + catch (Exception) + { + BranchesMarkersSplit.SplitterDistance = _defaultBranchMarkerSplitDistance; + } } #endregion diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs index 45c08457ac..97375fdf25 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs @@ -33,6 +33,9 @@ namespace BizHawk.Client.EmuHawk private UndoHistoryForm _undoForm; private Timer _autosaveTimer; + private int _defaultMainSplitDistance; + private int _defaultBranchMarkerSplitDistance; + /// /// Gets a value that separates "restore last position" logic from seeking caused by navigation. /// TASEditor never kills LastPositionFrame, and it only pauses on it, if it hasn't been greenzoned beforehand and middle mouse button was pressed. @@ -113,6 +116,9 @@ namespace BizHawk.Client.EmuHawk InitializeComponent(); InitializeSeekWorker(); + _defaultMainSplitDistance = MainVertialSplit.SplitterDistance; + _defaultBranchMarkerSplitDistance = BranchesMarkersSplit.SplitterDistance; + // TODO: show this at all times or hide it when saving is done? SavingProgressBar.Visible = false;