h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-28 02:02:53 +08:00
Code Issues Releases Wiki Activity

Ensure textbox always reverts to sane state on out-of-range failures

Browse Source
This commit is contained in:
Dean Herbert 2020-10-01 13:06:24 +09:00
parent 61e62929ee
commit e0a0902a15
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
osu.Game/Screens/Edit/Timing/SliderWithTextBoxInput.cs
View File

@ -54,9 +54,12 @@ namespace osu.Game.Screens.Edit.Timing
} }
catch catch
{ {
// will restore the previous text value on failure. // TriggerChange below will restore the previous text value on failure.
Current.TriggerChange();
} }
// This is run regardless of parsing success as the parsed number may not actually trigger a change
// due to bindable clamping. Even in such a case we want to update the textbox to a sane visual state.
Current.TriggerChange();
}; };
Current.BindValueChanged(val => Current.BindValueChanged(val =>

11
osu.Game/Screens/Edit/Timing/TimingSection.cs
View File

@ -65,18 +65,19 @@ namespace osu.Game.Screens.Edit.Timing
{ {
if (!isNew) return; if (!isNew) return;
if (double.TryParse(Current.Value, out double doubleVal))
{
try try
{ {
if (double.TryParse(Current.Value, out double doubleVal) && doubleVal > 0)
beatLengthBindable.Value = beatLengthToBpm(doubleVal); beatLengthBindable.Value = beatLengthToBpm(doubleVal);
} }
catch catch
{ {
// will restore the previous text value on failure. // TriggerChange below will restore the previous text value on failure.
}
// This is run regardless of parsing success as the parsed number may not actually trigger a change
// due to bindable clamping. Even in such a case we want to update the textbox to a sane visual state.
beatLengthBindable.TriggerChange(); beatLengthBindable.TriggerChange();
}
}
}; };
beatLengthBindable.BindValueChanged(val => beatLengthBindable.BindValueChanged(val =>