From 6a09bbce388b800a29b05f328d40217e5e7927de Mon Sep 17 00:00:00 2001 From: adelikat Date: Sun, 27 Sep 2020 10:35:58 -0500 Subject: [PATCH] Branches - fix settings the designer barfed on in a previous commit, and a bit of cleanup --- .../tools/TAStudio/BookmarksBranchesBox.Designer.cs | 5 ++++- .../tools/TAStudio/BookmarksBranchesBox.cs | 9 ++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.Designer.cs index 180f50d138..1a74200089 100644 --- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.Designer.cs @@ -148,14 +148,17 @@ this.BranchView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); + this.BranchView.CellWidthPadding = 3; this.BranchView.CellHeightPadding = 0; - this.BranchView.ChangeSelectionWhenPaging = true; + this.BranchView.ChangeSelectionWhenPaging = false; this.BranchView.ContextMenuStrip = this.BranchesContextMenu; this.BranchView.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.BranchView.FullRowSelect = true; + this.BranchView.GridLines = true; this.BranchView.HorizontalOrientation = false; this.BranchView.LetKeysModifySelection = false; this.BranchView.Location = new System.Drawing.Point(6, 19); + this.BranchView.MultiSelect = true; this.BranchView.Name = "BranchView"; this.BranchView.RowCount = 0; this.BranchView.ScrollSpeed = 13; diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs index aa46852a2a..c9518a8e91 100644 --- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs +++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs @@ -208,12 +208,6 @@ namespace BizHawk.Client.EmuHawk Tastudio.RefreshDialog(); } - private void UpdateBranch(TasBranch branch) - { - Branches.Replace(branch, CreateBranch()); - Tastudio.RefreshDialog(); - } - private void LoadSelectedBranch() { if (SelectedBranch != null) @@ -290,7 +284,8 @@ namespace BizHawk.Client.EmuHawk toolTip1.SetToolTip(UndoBranchButton, "Undo Branch Update"); _branchUndo = BranchUndo.Update; - UpdateBranch(SelectedBranch); + Branches.Replace(SelectedBranch, CreateBranch()); + Tastudio.RefreshDialog(); SavedCallback?.Invoke(Branches.Current); Tastudio.MainForm.AddOnScreenMessage($"Saved branch {Branches.Current}"); }