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:
parent
b7b10e2631
commit
9ff4b904c6
|
@ -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
|
||||
//
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue