sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-02 16:59:53 +09:00
Code Issues Packages Projects Releases Wiki Activity

Customize -> Customise

Browse Source
This commit is contained in:
Dean Herbert
2019-12-06 18:57:11 +09:00
parent cf0413663d
commit 46d055604a
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
osu.Game.Tests/Visual/UserInterface/TestSceneModCustomizationSettings.cs → osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs
View File

@ -13,7 +13,7 @@ using osu.Game.Rulesets.Mods;
namespace osu.Game.Tests.Visual.UserInterface namespace osu.Game.Tests.Visual.UserInterface
{ {
public class TestSceneModCustomizationSettings : OsuTestScene public class TestSceneModSettings : OsuTestScene
{ {
private TestModSelectOverlay modSelect; private TestModSelectOverlay modSelect;
@ -27,13 +27,13 @@ namespace osu.Game.Tests.Visual.UserInterface
Anchor = Anchor.BottomCentre, Anchor = Anchor.BottomCentre,
}); });
var testMod = new TestModCustomizable1(); var testMod = new TestModCustomisable1();
AddStep("open", modSelect.Show); AddStep("open", modSelect.Show);
AddAssert("button disabled", () => !modSelect.CustomizeButton.Enabled.Value); AddAssert("button disabled", () => !modSelect.CustomiseButton.Enabled.Value);
AddStep("select mod", () => modSelect.SelectMod(testMod)); AddStep("select mod", () => modSelect.SelectMod(testMod));
AddAssert("button enabled", () => modSelect.CustomizeButton.Enabled.Value); AddAssert("button enabled", () => modSelect.CustomiseButton.Enabled.Value);
AddStep("open customization", () => modSelect.CustomizeButton.Click()); AddStep("open Customisation", () => modSelect.CustomiseButton.Click());
AddStep("deselect mod", () => modSelect.SelectMod(testMod)); AddStep("deselect mod", () => modSelect.SelectMod(testMod));
AddAssert("controls hidden", () => modSelect.ModSettingsContainer.Alpha == 0); AddAssert("controls hidden", () => modSelect.ModSettingsContainer.Alpha == 0);
} }
@ -41,7 +41,7 @@ namespace osu.Game.Tests.Visual.UserInterface
private class TestModSelectOverlay : ModSelectOverlay private class TestModSelectOverlay : ModSelectOverlay
{ {
public new Container ModSettingsContainer => base.ModSettingsContainer; public new Container ModSettingsContainer => base.ModSettingsContainer;
public new TriangleButton CustomizeButton => base.CustomizeButton; public new TriangleButton CustomiseButton => base.CustomiseButton;
public void SelectMod(Mod mod) => public void SelectMod(Mod mod) =>
ModSectionsContainer.Children.Single(s => s.ModType == mod.Type) ModSectionsContainer.Children.Single(s => s.ModType == mod.Type)
@ -57,8 +57,8 @@ namespace osu.Game.Tests.Visual.UserInterface
{ {
section.Mods = new Mod[] section.Mods = new Mod[]
{ {
new TestModCustomizable1(), new TestModCustomisable1(),
new TestModCustomizable2() new TestModCustomisable2()
}; };
} }
else else
@ -67,21 +67,21 @@ namespace osu.Game.Tests.Visual.UserInterface
} }
} }
private class TestModCustomizable1 : TestModCustomizable private class TestModCustomisable1 : TestModCustomisable
{ {
public override string Name => "Customizable Mod 1"; public override string Name => "Customisable Mod 1";
public override string Acronym => "CM1"; public override string Acronym => "CM1";
} }
private class TestModCustomizable2 : TestModCustomizable private class TestModCustomisable2 : TestModCustomisable
{ {
public override string Name => "Customizable Mod 2"; public override string Name => "Customisable Mod 2";
public override string Acronym => "CM2"; public override string Acronym => "CM2";
} }
private abstract class TestModCustomizable : Mod, IApplicableMod private abstract class TestModCustomisable : Mod, IApplicableMod
{ {
public override double ScoreMultiplier => 1.0; public override double ScoreMultiplier => 1.0;

6
osu.Game/Overlays/Mods/ModSelectOverlay.cs
View File

@ -32,7 +32,7 @@ namespace osu.Game.Overlays.Mods
public class ModSelectOverlay : WaveOverlayContainer public class ModSelectOverlay : WaveOverlayContainer
{ {
protected readonly TriangleButton DeselectAllButton; protected readonly TriangleButton DeselectAllButton;
protected readonly TriangleButton CustomizeButton; protected readonly TriangleButton CustomiseButton;
protected readonly TriangleButton CloseButton; protected readonly TriangleButton CloseButton;
protected readonly OsuSpriteText MultiplierLabel; protected readonly OsuSpriteText MultiplierLabel;
@ -232,7 +232,7 @@ namespace osu.Game.Overlays.Mods
Right = 20 Right = 20
} }
}, },
CustomizeButton = new TriangleButton CustomiseButton = new TriangleButton
{ {
Width = 180, Width = 180,
Text = "Customization", Text = "Customization",
@ -351,7 +351,7 @@ namespace osu.Game.Overlays.Mods
ModSettingsContent.RemoveAll(section => section.Mod == removed); ModSettingsContent.RemoveAll(section => section.Mod == removed);
bool hasSettings = ModSettingsContent.Children.Count > 0; bool hasSettings = ModSettingsContent.Children.Count > 0;
CustomizeButton.Enabled.Value = hasSettings; CustomiseButton.Enabled.Value = hasSettings;
if (!hasSettings) if (!hasSettings)
ModSettingsContainer.Hide(); ModSettingsContainer.Hide();