h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 09:27:29 +08:00
Code Issues Releases Wiki Activity

Fix incorrect naming of label

Browse Source
This commit is contained in:
Dean Herbert 2018-05-31 12:39:56 +09:00
parent 2f21b9c4ea
commit 319faf12f7
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game.Tests/Visual/TestCaseMods.cs
View File

@ -199,13 +199,13 @@ namespace osu.Game.Tests.Visual
private void testRankedText(Mod mod)
{
AddWaitStep(1, "wait for fade");
AddAssert("check for ranked", () => modSelect.RankedLabel.Alpha == 0);
AddAssert("check for ranked", () => modSelect.UnrankedLabel.Alpha == 0);
selectNext(mod);
AddWaitStep(1, "wait for fade");
AddAssert("check for unranked", () => modSelect.RankedLabel.Alpha != 0);
AddAssert("check for unranked", () => modSelect.UnrankedLabel.Alpha != 0);
selectPrevious(mod);
AddWaitStep(1, "wait for fade");
AddAssert("check for ranked", () => modSelect.RankedLabel.Alpha == 0);
AddAssert("check for ranked", () => modSelect.UnrankedLabel.Alpha == 0);
}
private void selectNext(Mod mod) => AddStep($"left click {mod.Name}", () => modSelect.GetModButton(mod)?.SelectNext(1));
@ -241,7 +241,7 @@ namespace osu.Game.Tests.Visual
}
public new OsuSpriteText MultiplierLabel => base.MultiplierLabel;
public new OsuSpriteText RankedLabel => base.RankedLabel;
public new OsuSpriteText UnrankedLabel => base.UnrankedLabel;
public new TriangleButton DeselectAllButton => base.DeselectAllButton;
public new Color4 LowMultiplierColour => base.LowMultiplierColour;

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

@ -31,7 +31,7 @@ namespace osu.Game.Overlays.Mods
protected Color4 LowMultiplierColour, HighMultiplierColour;
protected readonly TriangleButton DeselectAllButton;
protected readonly OsuSpriteText MultiplierLabel, RankedLabel;
protected readonly OsuSpriteText MultiplierLabel, UnrankedLabel;
private readonly FillFlowContainer footerContainer;
protected override bool BlockPassThroughKeyboard => false;
@ -107,9 +107,9 @@ namespace osu.Game.Overlays.Mods
MultiplierLabel.FadeColour(Color4.White, 200);
if (ranked)
RankedLabel.FadeOut(200);
UnrankedLabel.FadeOut(200);
else
RankedLabel.FadeIn(200);
UnrankedLabel.FadeIn(200);
}
protected override void PopOut()
@ -373,7 +373,7 @@ namespace osu.Game.Overlays.Mods
Top = 5
}
},
RankedLabel = new OsuSpriteText
UnrankedLabel = new OsuSpriteText
{
Font = @"Exo2.0-Bold",
Text = @"(Unranked)",