RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #30113 from bdach/fix-separator-jank 

Fix improper handling of decimal separator in "form" number boxes / sliders
This commit is contained in:
Dean Herbert 2024-10-07 13:42:02 +09:00 committed by GitHub
parent e64c2d57bb 45a6a743a2
commit 5859021003
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Graphics/UserInterfaceV2/FormNumberBox.cs
View File

@ -1,6 +1,8 @@
// 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 System.Globalization;
namespace osu.Game.Graphics.UserInterfaceV2
{
public partial class FormNumberBox : FormTextBox
@ -18,7 +20,7 @@ internal partial class InnerNumberBox : InnerTextBox
public bool AllowDecimals { get; init; }
protected override bool CanAddCharacter(char character)
=> char.IsAsciiDigit(character) || (AllowDecimals && character == '.');
=> char.IsAsciiDigit(character) || (AllowDecimals && CultureInfo.CurrentCulture.NumberFormat.NumberDecimalSeparator.Contains(character));
}
}
}

13
osu.Game/Graphics/UserInterfaceV2/FormSliderBar.cs
View File

@ -17,6 +17,7 @@
using osu.Framework.Input.Events;
using osu.Framework.Localisation;
using osu.Game.Graphics.UserInterface;
using osu.Game.Localisation;
using osu.Game.Overlays;
namespace osu.Game.Graphics.UserInterfaceV2
@ -83,8 +84,10 @@ public CompositeDrawable? TabbableContentContainer
[Resolved]
private OverlayColourProvider colourProvider { get; set; } = null!;
private readonly Bindable<Language> currentLanguage = new Bindable<Language>();
[BackgroundDependencyLoader]
private void load(OsuColour colours)
private void load(OsuColour colours, OsuGame? game)
{
RelativeSizeAxes = Axes.X;
Height = 50;
@ -150,6 +153,9 @@ private void load(OsuColour colours)
},
},
};
if (game != null)
currentLanguage.BindTo(game.CurrentLanguage);
}
protected override void LoadComplete()
@ -164,10 +170,11 @@ protected override void LoadComplete()
slider.IsDragging.BindValueChanged(_ => updateState());
currentLanguage.BindValueChanged(_ => Schedule(updateValueDisplay));
current.BindValueChanged(_ =>
{
updateState();
updateTextBoxFromSlider();
updateValueDisplay();
}, true);
}
@ -258,7 +265,7 @@ private void updateState()
background.Colour = colourProvider.Background5;
}
private void updateTextBoxFromSlider()
private void updateValueDisplay()
{
if (updatingFromTextBox) return;