mirror of
https://github.com/ppy/osu.git
synced 2024-11-14 05:43:33 +08:00
4a9f080f3c
This fixes stack overflow exceptions that would arise when a `Current.Value` of 1 billion or more was set on a `SettingsNumberBox`. The stack overflow was caused by the "maximum 9 digits" spec. If a value technically within `int` bounds, but larger than 1 billion (in the range [1,000,000,000; 2,147,483,647], to be more precise), a feedback loop between the setting control's `Current` and its inner text box's `Current` would occur, wherein the last digit would be trimmed and then re-appended again forevermore. To resolve, remove the offending spec and rely on `int.TryParse` entirely to be able to discern overflow range. Additionally, UX of the text box is slightly changed to notify when the `int` range is exceeded with a red flash. This behaviour would not have been possible to implement without recent framework-side fixes to text box (removal of text set scheduling).
76 lines
2.4 KiB
C#
76 lines
2.4 KiB
C#
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
|
|
// See the LICENCE file in the repository root for full licence text.
|
|
|
|
using osu.Framework.Bindables;
|
|
using osu.Framework.Graphics;
|
|
using osu.Framework.Graphics.Containers;
|
|
using osu.Framework.Graphics.UserInterface;
|
|
|
|
namespace osu.Game.Overlays.Settings
|
|
{
|
|
public class SettingsNumberBox : SettingsItem<int?>
|
|
{
|
|
protected override Drawable CreateControl() => new NumberControl
|
|
{
|
|
RelativeSizeAxes = Axes.X,
|
|
};
|
|
|
|
private sealed class NumberControl : CompositeDrawable, IHasCurrentValue<int?>
|
|
{
|
|
private readonly BindableWithCurrent<int?> current = new BindableWithCurrent<int?>();
|
|
|
|
public Bindable<int?> Current
|
|
{
|
|
get => current.Current;
|
|
set => current.Current = value;
|
|
}
|
|
|
|
public NumberControl()
|
|
{
|
|
AutoSizeAxes = Axes.Y;
|
|
|
|
OutlinedNumberBox numberBox;
|
|
|
|
InternalChildren = new[]
|
|
{
|
|
numberBox = new OutlinedNumberBox
|
|
{
|
|
Margin = new MarginPadding { Top = 5 },
|
|
RelativeSizeAxes = Axes.X,
|
|
CommitOnFocusLost = true
|
|
}
|
|
};
|
|
|
|
numberBox.Current.BindValueChanged(e =>
|
|
{
|
|
if (string.IsNullOrEmpty(e.NewValue))
|
|
{
|
|
Current.Value = null;
|
|
return;
|
|
}
|
|
|
|
if (int.TryParse(e.NewValue, out int intVal))
|
|
Current.Value = intVal;
|
|
else
|
|
numberBox.NotifyInputError();
|
|
|
|
// trigger Current again to either restore the previous text box value, or to reformat the new value via .ToString().
|
|
Current.TriggerChange();
|
|
});
|
|
|
|
Current.BindValueChanged(e =>
|
|
{
|
|
numberBox.Current.Value = e.NewValue?.ToString();
|
|
});
|
|
}
|
|
}
|
|
|
|
private class OutlinedNumberBox : OutlinedTextBox
|
|
{
|
|
protected override bool CanAddCharacter(char character) => char.IsNumber(character);
|
|
|
|
public new void NotifyInputError() => base.NotifyInputError();
|
|
}
|
|
}
|
|
}
|