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

Clean up code from reviews

Browse Source
This commit is contained in:
Joseph Madamba
2018-03-28 19:53:15 -07:00
parent ac9527147f
commit 5457f17e79
2 changed files with 15 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -184,11 +184,14 @@ namespace osu.Game.Tests.Visual
private void testRankedText(Mod mod) private void testRankedText(Mod mod)
{ {
AddAssert("check for ranked", () => !modSelect.RankedLabel.Text.Equals(unranked_suffix)); AddWaitStep(1, "wait for fade");
AddAssert("check for ranked", () => modSelect.RankedLabel.Alpha.Equals(0));
selectNext(mod); selectNext(mod);
AddAssert("check for unranked", () => modSelect.RankedLabel.Text.Equals(unranked_suffix)); AddWaitStep(1, "wait for fade");
AddAssert("check for unranked", () => !modSelect.RankedLabel.Alpha.Equals(0));
selectPrevious(mod); selectPrevious(mod);
AddAssert("check for ranked", () => !modSelect.RankedLabel.Text.Equals(unranked_suffix)); AddWaitStep(1, "wait for fade");
AddAssert("check for ranked", () => modSelect.RankedLabel.Alpha.Equals(0));
} }
private void selectNext(Mod mod) => AddStep($"left click {mod.Name}", () => modSelect.GetModButton(mod)?.SelectNext(1)); private void selectNext(Mod mod) => AddStep($"left click {mod.Name}", () => modSelect.GetModButton(mod)?.SelectNext(1));

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

@ -27,12 +27,10 @@ namespace osu.Game.Overlays.Mods
{ {
private const float content_width = 0.8f; private const float content_width = 0.8f;
protected Color4 LowMultiplierColour, HighMultiplierColour, RankedColour; protected Color4 LowMultiplierColour, HighMultiplierColour;
protected readonly TriangleButton DeselectAllButton; protected readonly TriangleButton DeselectAllButton;
protected readonly OsuSpriteText ScoreLabel; protected readonly OsuSpriteText MultiplierLabel, RankedLabel;
protected readonly OsuSpriteText MultiplierLabel;
protected readonly OsuSpriteText RankedLabel;
private readonly FillFlowContainer footerContainer; private readonly FillFlowContainer footerContainer;
protected override bool BlockPassThroughKeyboard => false; protected override bool BlockPassThroughKeyboard => false;
@ -59,7 +57,6 @@ namespace osu.Game.Overlays.Mods
LowMultiplierColour = colours.Red; LowMultiplierColour = colours.Red;
HighMultiplierColour = colours.Green; HighMultiplierColour = colours.Green;
RankedColour = colours.Blue;
if (osu != null) if (osu != null)
Ruleset.BindTo(osu.Ruleset); Ruleset.BindTo(osu.Ruleset);
@ -100,14 +97,6 @@ namespace osu.Game.Overlays.Mods
ranked &= mod.Ranked; ranked &= mod.Ranked;
} }
ScoreLabel.Text = "Score Multiplier:";
if (multiplier > 1.0)
ScoreLabel.FadeColour(HighMultiplierColour, 200);
else if (multiplier < 1.0)
ScoreLabel.FadeColour(LowMultiplierColour, 200);
else
ScoreLabel.FadeColour(Color4.White, 200);
MultiplierLabel.Text = $"{multiplier:N2}x"; MultiplierLabel.Text = $"{multiplier:N2}x";
if (multiplier > 1.0) if (multiplier > 1.0)
MultiplierLabel.FadeColour(HighMultiplierColour, 200); MultiplierLabel.FadeColour(HighMultiplierColour, 200);
@ -116,13 +105,10 @@ namespace osu.Game.Overlays.Mods
else else
MultiplierLabel.FadeColour(Color4.White, 200); MultiplierLabel.FadeColour(Color4.White, 200);
RankedLabel.Text = "(Unranked)"; if (ranked)
RankedLabel.FadeColour(RankedColour, 200); RankedLabel.FadeOut(200);
RankedLabel.FadeOut(200); else
if (!ranked)
{
RankedLabel.FadeIn(200); RankedLabel.FadeIn(200);
}
} }
protected override void PopOut() protected override void PopOut()
@ -367,8 +353,9 @@ namespace osu.Game.Overlays.Mods
Right = 20 Right = 20
} }
}, },
ScoreLabel = new OsuSpriteText new OsuSpriteText
{ {
Text = @"Score Multiplier:",
TextSize = 30, TextSize = 30,
Shadow = true, Shadow = true,
Margin = new MarginPadding Margin = new MarginPadding
@ -390,7 +377,9 @@ namespace osu.Game.Overlays.Mods
RankedLabel = new OsuSpriteText RankedLabel = new OsuSpriteText
{ {
Font = @"Exo2.0-Bold", Font = @"Exo2.0-Bold",
Text = @"(Unranked)",
TextSize = 30, TextSize = 30,
Colour = OsuColour.FromHex(@"66ccff"),
Shadow = true, Shadow = true,
Margin = new MarginPadding Margin = new MarginPadding
{ {