mirror of
https://github.com/ppy/osu.git
synced 2024-12-16 19:13:22 +08:00
Merge remote-tracking branch 'origin/decouple-mod-select-bindable' into present-replay-from-ss
This commit is contained in:
commit
89cdf8ec2b
@ -63,6 +63,7 @@ namespace osu.Game.Tests.Visual.UserInterface
|
|||||||
RelativeSizeAxes = Axes.X,
|
RelativeSizeAxes = Axes.X,
|
||||||
Origin = Anchor.BottomCentre,
|
Origin = Anchor.BottomCentre,
|
||||||
Anchor = Anchor.BottomCentre,
|
Anchor = Anchor.BottomCentre,
|
||||||
|
SelectedMods = { BindTarget = SelectedMods }
|
||||||
},
|
},
|
||||||
|
|
||||||
modDisplay = new ModDisplay
|
modDisplay = new ModDisplay
|
||||||
|
@ -27,6 +27,13 @@ namespace osu.Game.Tests.Visual.UserInterface
|
|||||||
|
|
||||||
private readonly Mod testCustomisableAutoOpenMod = new TestModCustomisable2();
|
private readonly Mod testCustomisableAutoOpenMod = new TestModCustomisable2();
|
||||||
|
|
||||||
|
[SetUp]
|
||||||
|
public void SetUp() => Schedule(() =>
|
||||||
|
{
|
||||||
|
SelectedMods.Value = Array.Empty<Mod>();
|
||||||
|
Ruleset.Value = new TestRulesetInfo();
|
||||||
|
});
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
public void TestButtonShowsOnCustomisableMod()
|
public void TestButtonShowsOnCustomisableMod()
|
||||||
{
|
{
|
||||||
@ -70,13 +77,12 @@ namespace osu.Game.Tests.Visual.UserInterface
|
|||||||
{
|
{
|
||||||
AddStep("create mod select", () =>
|
AddStep("create mod select", () =>
|
||||||
{
|
{
|
||||||
Ruleset.Value = new TestRulesetInfo();
|
|
||||||
|
|
||||||
Child = modSelect = new TestModSelectOverlay
|
Child = modSelect = new TestModSelectOverlay
|
||||||
{
|
{
|
||||||
RelativeSizeAxes = Axes.X,
|
RelativeSizeAxes = Axes.X,
|
||||||
Origin = Anchor.BottomCentre,
|
Origin = Anchor.BottomCentre,
|
||||||
Anchor = Anchor.BottomCentre,
|
Anchor = Anchor.BottomCentre,
|
||||||
|
SelectedMods = { BindTarget = SelectedMods }
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user