From 9ff4b904c667c490776159cfd8e15ec188d26f3f Mon Sep 17 00:00:00 2001 From: adelikat Date: Fri, 16 Apr 2021 09:04:16 -0500 Subject: [PATCH] Tastudio - revert double click edit, fix double click navigation to be double click not mouse double click, simplify range checking in said logic --- .../tools/TAStudio/MarkerControl.Designer.cs | 3 +-- .../tools/TAStudio/MarkerControl.cs | 18 ++++-------------- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.Designer.cs index a89487fff1..c6350f7fa1 100644 --- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.Designer.cs @@ -183,8 +183,7 @@ this.MarkerView.TabIndex = 0; this.MarkerView.TabStop = false; this.MarkerView.SelectedIndexChanged += new System.EventHandler(this.MarkerView_SelectedIndexChanged); - this.MarkerView.DoubleClick += new System.EventHandler(this.MarkerView_DoubleClick); - this.MarkerView.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.MarkerView_MouseDoubleClick); + this.MarkerView.DoubleClick += new System.EventHandler(this.MarkerView_MouseDoubleClick); // // MarkersGroupBox // diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs index 47f917b53e..b69dd4ccfc 100644 --- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs +++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs @@ -294,11 +294,12 @@ namespace BizHawk.Client.EmuHawk // SuuperW: Marker renaming can be done with a right-click. // A much more useful feature would be to easily jump to it. - private void MarkerView_MouseDoubleClick(object sender, MouseEventArgs e) + private void MarkerView_MouseDoubleClick(object sender, EventArgs e) { - if (MarkerView.CurrentCell?.RowIndex != null && MarkerView.CurrentCell.RowIndex < MarkerView.RowCount) + if (MarkerView.AnyRowsSelected) { - var marker = Markers[MarkerView.CurrentCell.RowIndex.Value]; + var index = MarkerView.SelectedRows.First(); + var marker = Markers[index]; Tastudio.GoToFrame(marker.Frame); } } @@ -309,21 +310,10 @@ namespace BizHawk.Client.EmuHawk { var index = MarkerView.SelectedRows.First(); var marker = Markers[index]; - return marker.Frame; } return -1; } - - private void MarkerView_DoubleClick(object sender, EventArgs e) - { - if (MarkerView.AnyRowsSelected) - { - var index = MarkerView.SelectedRows.First(); - var marker = Markers[index]; - EditMarkerPopUp(marker); - } - } } }