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

Apply some sketchy nullable related changes 

TasView_PointedCellChanged will now not short-circuit when the OldCell has null values (happens on MouseEnter mainly).
Also, null column is accepted as this allows dragging off-control without input being dropped.
Also, OldCell and NewCell are assumed to never be null (is true in the current logic).
This commit is contained in:
Morilli 2024-06-23 02:11:24 +02:00
parent 8278b30579
commit e1af631af6
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs
View File

@ -936,10 +936,7 @@ namespace BizHawk.Client.EmuHawk
private void TasView_PointedCellChanged(object sender, InputRoll.CellEventArgs e) private void TasView_PointedCellChanged(object sender, InputRoll.CellEventArgs e)
{ {
// TODO: If NewCell is null, it indicates that there was a mouse leave scenario, we may want to account for that if (e.NewCell.RowIndex is null)
// For now return if a null because this happens OnEnter which doesn't have any of the below behaviors yet
if (e.OldCell?.Column == null || e.OldCell?.RowIndex == null
|| e.NewCell?.Column == null || e.NewCell?.RowIndex == null)
{ {
return; return;
} }
@ -951,7 +948,7 @@ namespace BizHawk.Client.EmuHawk
if (_paintingMinFrame >= 0) if (_paintingMinFrame >= 0)
{ {
_paintingMinFrame = Math.Min(_paintingMinFrame, e.NewCell?.RowIndex ?? 0); _paintingMinFrame = Math.Min(_paintingMinFrame, e.NewCell.RowIndex.Value);
} }
// skip rerecord counting on drawing entirely, mouse down is enough // skip rerecord counting on drawing entirely, mouse down is enough
@ -961,7 +958,7 @@ namespace BizHawk.Client.EmuHawk
int startVal, endVal; int startVal, endVal;
int frame = e.NewCell.RowIndex.Value; int frame = e.NewCell.RowIndex.Value;
if (e.OldCell.RowIndex.Value < e.NewCell.RowIndex.Value) if (e.OldCell.RowIndex < e.NewCell.RowIndex)
{ {
startVal = e.OldCell.RowIndex.Value; startVal = e.OldCell.RowIndex.Value;
endVal = e.NewCell.RowIndex.Value; endVal = e.NewCell.RowIndex.Value;
@ -973,7 +970,7 @@ namespace BizHawk.Client.EmuHawk
else else
{ {
startVal = e.NewCell.RowIndex.Value; startVal = e.NewCell.RowIndex.Value;
endVal = e.OldCell.RowIndex.Value; endVal = e.OldCell.RowIndex ?? e.NewCell.RowIndex.Value;
if(_patternPaint) if(_patternPaint)
{ {
endVal = _startRow; endVal = _startRow;