ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Tastudio - revert double click edit, fix double click navigation to be double click not mouse double click, simplify range checking in said logic

This commit is contained in:
adelikat 2021-04-16 09:04:16 -05:00
parent b7b10e2631
commit 9ff4b904c6
2 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.Designer.cs generated
View File

@ -183,8 +183,7 @@
this.MarkerView.TabIndex = 0; this.MarkerView.TabIndex = 0;
this.MarkerView.TabStop = false; this.MarkerView.TabStop = false;
this.MarkerView.SelectedIndexChanged += new System.EventHandler(this.MarkerView_SelectedIndexChanged); this.MarkerView.SelectedIndexChanged += new System.EventHandler(this.MarkerView_SelectedIndexChanged);
this.MarkerView.DoubleClick += new System.EventHandler(this.MarkerView_DoubleClick); this.MarkerView.DoubleClick += new System.EventHandler(this.MarkerView_MouseDoubleClick);
this.MarkerView.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.MarkerView_MouseDoubleClick);
// //
// MarkersGroupBox // MarkersGroupBox
// //

18
src/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs
View File

@ -294,11 +294,12 @@ namespace BizHawk.Client.EmuHawk
// SuuperW: Marker renaming can be done with a right-click. // SuuperW: Marker renaming can be done with a right-click.
// A much more useful feature would be to easily jump to it. // 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); Tastudio.GoToFrame(marker.Frame);
} }
} }
@ -309,21 +310,10 @@ namespace BizHawk.Client.EmuHawk
{ {
var index = MarkerView.SelectedRows.First(); var index = MarkerView.SelectedRows.First();
var marker = Markers[index]; var marker = Markers[index];
return marker.Frame; return marker.Frame;
} }
return -1; return -1;
} }
private void MarkerView_DoubleClick(object sender, EventArgs e)
{
if (MarkerView.AnyRowsSelected)
{
var index = MarkerView.SelectedRows.First();
var marker = Markers[index];
EditMarkerPopUp(marker);
}
}
} }
} }