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

Fixed #533. (Use TryParse, don't try to use a value that can't be parsed.) 

Made numpad minus key work when typing a float value.
Made current typed float value display (so that "-" can show up).
This commit is contained in:
Suuper 2016-01-29 12:22:28 -06:00
parent 12388cbe3d
commit 81b2a5d597
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs
View File

@ -244,7 +244,10 @@ namespace BizHawk.Client.EmuHawk
}
else
{
if (index < CurrentTasMovie.InputLogLength)
// Display typed float value (string "-" can't be parsed, so CurrentTasMovie.DisplayValue can't return it)
if (index == _floatEditRow && columnName == _floatEditColumn)
text = _floatTypedValue;
else if (index < CurrentTasMovie.InputLogLength)
text = CurrentTasMovie.DisplayValue(index, columnName);
}
}
@ -885,7 +888,7 @@ namespace BizHawk.Client.EmuHawk
_floatTypedValue += e.KeyCode - Keys.D0;
else if (e.KeyCode >= Keys.NumPad0 && e.KeyCode <= Keys.NumPad9)
_floatTypedValue += e.KeyCode - Keys.NumPad0;
else if (e.KeyCode == Keys.OemMinus)
else if (e.KeyCode == Keys.OemMinus || e.KeyCode == Keys.Subtract)
{
if (_floatTypedValue.StartsWith("-"))
_floatTypedValue = _floatTypedValue.Substring(1);
@ -939,12 +942,14 @@ namespace BizHawk.Client.EmuHawk
}
else
{
value = Convert.ToSingle(_floatTypedValue);
if (value > rMax)
value = rMax;
else if (value < rMin)
value = rMin;
CurrentTasMovie.SetFloatState(_floatEditRow, _floatEditColumn, value);
if (float.TryParse(_floatTypedValue, out value)) // String "-" can't be parsed.
{
if (value > rMax)
value = rMax;
else if (value < rMin)
value = rMin;
CurrentTasMovie.SetFloatState(_floatEditRow, _floatEditColumn, value);
}
}
if (value != prev) // Auto-restore
{