Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Do not revert to default value when double-clicking disabled slider #25230

Merged
merged 5 commits into from
Oct 26, 2023
Merged

Do not revert to default value when double-clicking disabled slider #25230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
910d74f
Add failing test coverage for double-click on disabled sliders
bdach Oct 26, 2023
96437c4
Fix tests specifying float precision for double bindable
bdach Oct 26, 2023
89fec95
Fix cross-test data dependency by recreating slider every time
bdach Oct 26, 2023
3b9c4c9
Do not revert to default value when double-clicking disabled slider
bdach Oct 26, 2023
54b6933
Merge branch 'master' into double-click-disabled-slider
frenzibyte Oct 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
39 changes: 27 additions & 12 deletions osu.Game.Tests/Visual/UserInterface/TestSceneRoundedSliderBar.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,26 +18,24 @@ public partial class TestSceneRoundedSliderBar : OsuManualInputManagerTestScene
[Cached]
private OverlayColourProvider colourProvider { get; set; } = new OverlayColourProvider(OverlayColourScheme.Purple);

private readonly BindableDouble current = new BindableDouble(5)
{
Precision = 0.1f,
MinValue = 0,
MaxValue = 15
};

private RoundedSliderBar<double> slider = null!;

[BackgroundDependencyLoader]
private void load()
[SetUpSteps]
public void SetUpSteps()
{
Child = slider = new RoundedSliderBar<double>
AddStep("create slider", () => Child = slider = new RoundedSliderBar<double>
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Current = current,
Current = new BindableDouble(5)
{
Precision = 0.1,
MinValue = 0,
MaxValue = 15
},
RelativeSizeAxes = Axes.X,
Width = 0.4f
};
});
}

[Test]
Expand All @@ -55,5 +53,22 @@ public void TestNubDoubleClickRevertToDefault()

AddAssert("slider is default", () => slider.Current.IsDefault);
}

[Test]
public void TestNubDoubleClickOnDisabledSliderDoesNothing()
{
AddStep("set slider to 1", () => slider.Current.Value = 1);
AddStep("disable slider", () => slider.Current.Disabled = true);

AddStep("move mouse to nub", () => InputManager.MoveMouseTo(slider.ChildrenOfType<Nub>().Single()));

AddStep("double click nub", () =>
{
InputManager.Click(MouseButton.Left);
InputManager.Click(MouseButton.Left);
});

AddAssert("slider is still at 1", () => slider.Current.Value, () => Is.EqualTo(1));
}
}
}
39 changes: 27 additions & 12 deletions osu.Game.Tests/Visual/UserInterface/TestSceneShearedSliderBar.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,26 +18,24 @@ public partial class TestSceneShearedSliderBar : OsuManualInputManagerTestScene
[Cached]
private OverlayColourProvider colourProvider { get; set; } = new OverlayColourProvider(OverlayColourScheme.Purple);

private readonly BindableDouble current = new BindableDouble(5)
{
Precision = 0.1f,
MinValue = 0,
MaxValue = 15
};

private ShearedSliderBar<double> slider = null!;

[BackgroundDependencyLoader]
private void load()
[SetUpSteps]
public void SetUpSteps()
{
Child = slider = new ShearedSliderBar<double>
AddStep("create slider", () => Child = slider = new ShearedSliderBar<double>
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Current = current,
Current = new BindableDouble(5)
{
Precision = 0.1,
MinValue = 0,
MaxValue = 15
},
RelativeSizeAxes = Axes.X,
Width = 0.4f
};
});
}

[Test]
Expand All @@ -55,5 +53,22 @@ public void TestNubDoubleClickRevertToDefault()

AddAssert("slider is default", () => slider.Current.IsDefault);
}

[Test]
public void TestNubDoubleClickOnDisabledSliderDoesNothing()
{
AddStep("set slider to 1", () => slider.Current.Value = 1);
AddStep("disable slider", () => slider.Current.Disabled = true);

AddStep("move mouse to nub", () => InputManager.MoveMouseTo(slider.ChildrenOfType<ShearedNub>().Single()));

AddStep("double click nub", () =>
{
InputManager.Click(MouseButton.Left);
InputManager.Click(MouseButton.Left);
});

AddAssert("slider is still at 1", () => slider.Current.Value, () => Is.EqualTo(1));
}
}
}
6 changes: 5 additions & 1 deletion osu.Game/Graphics/UserInterface/RoundedSliderBar.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,11 @@ public RoundedSliderBar()
Origin = Anchor.TopCentre,
RelativePositionAxes = Axes.X,
Current = { Value = true },
OnDoubleClicked = () => Current.SetDefault(),
OnDoubleClicked = () =>
{
if (!Current.Disabled)
Current.SetDefault();
},
},
},
hoverClickSounds = new HoverClickSounds()
Expand Down
6 changes: 5 additions & 1 deletion osu.Game/Graphics/UserInterface/ShearedSliderBar.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,11 @@ public ShearedSliderBar()
Origin = Anchor.TopCentre,
RelativePositionAxes = Axes.X,
Current = { Value = true },
OnDoubleClicked = () => Current.SetDefault(),
OnDoubleClicked = () =>
{
if (!Current.Disabled)
Current.SetDefault();
},
},
},
hoverClickSounds = new HoverClickSounds()
Expand Down