h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2026-05-30 01:49:56 +08:00
Code Issues Releases Wiki Activity

Fix disabled form slider bars being half-baked

Browse Source 
In order of severity:

- You could actually click on the textbox portion of a disabled textbox,
  focus it, select text, input stuff, and commit, which would die
  on the spot.

- The slider part had no visual indication that it's not interactable
  anymore.
This commit is contained in:
Bartłomiej Dach
2025-12-19 12:17:44 +01:00
Unverified
parent 32454caaa9
commit ecc51d4701
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osu.Game/Graphics/UserInterfaceV2/FormSliderBar.cs
+16 -4
View File
@@ -207,6 +207,8 @@ namespace osu.Game.Graphics.UserInterfaceV2
}
currentNumberInstantaneous.Disabled = disabled;
textBox.ReadOnly = disabled;
updateState();
};
current.CopyTo(currentNumberInstantaneous);
@@ -283,7 +285,8 @@ namespace osu.Game.Graphics.UserInterfaceV2
protected override bool OnClick(ClickEvent e)
{
focusManager.ChangeFocus(textBox);
if (!Current.Disabled)
focusManager.ChangeFocus(textBox);
return true;
}
@@ -380,7 +383,7 @@ namespace osu.Game.Graphics.UserInterfaceV2
protected override void LoadComplete()
{
base.LoadComplete();
updateState();
Current.BindDisabledChanged(_ => updateState(), true);
}
protected override void UpdateAfterChildren()
@@ -434,8 +437,17 @@ namespace osu.Game.Graphics.UserInterfaceV2
private void updateState()
{
rightBox.Colour = colourProvider.Background6;
leftBox.Colour = HasFocus || IsHovered || IsDragged ? colourProvider.Highlight1.Opacity(0.5f) : colourProvider.Dark2;
nub.Colour = HasFocus || IsHovered || IsDragged ? colourProvider.Highlight1 : colourProvider.Light4;
if (Current.Disabled)
{
leftBox.Colour = colourProvider.Dark3;
nub.Colour = colourProvider.Dark1;
}
else
{
leftBox.Colour = HasFocus || IsHovered || IsDragged ? colourProvider.Highlight1.Opacity(0.5f) : colourProvider.Dark2;
nub.Colour = HasFocus || IsHovered || IsDragged ? colourProvider.Highlight1 : colourProvider.Light4;
}
}
protected override void UpdateValue(float value)