1
0
mirror of https://github.com/ppy/osu.git synced 2025-01-13 16:32:54 +08:00

Fix file ordering

This commit is contained in:
Dean Herbert 2019-08-13 11:34:45 +09:00
parent 5e49d0fb28
commit 5447e7cf22

View File

@ -66,12 +66,7 @@ namespace osu.Game.Overlays.OSD
ValueText.Origin = optionCount > 0 ? Anchor.BottomCentre : Anchor.Centre; ValueText.Origin = optionCount > 0 ? Anchor.BottomCentre : Anchor.Centre;
for (int i = 0; i < optionCount; i++) for (int i = 0; i < optionCount; i++)
{ optionLights.Add(new OptionLight { Glowing = i == selectedOption });
optionLights.Add(new OptionLight
{
Glowing = i == selectedOption
});
}
} }
private class OptionLight : Container private class OptionLight : Container
@ -109,20 +104,6 @@ namespace osu.Game.Overlays.OSD
} }
} }
private void updateGlow()
{
if (glowing)
{
fill.FadeColour(glowingColour, transition_speed, Easing.OutQuint);
FadeEdgeEffectTo(glow_strength, transition_speed, Easing.OutQuint);
}
else
{
FadeEdgeEffectTo(0, transition_speed, Easing.OutQuint);
fill.FadeColour(idleColour, transition_speed, Easing.OutQuint);
}
}
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuColour colours) private void load(OsuColour colours)
{ {
@ -147,6 +128,20 @@ namespace osu.Game.Overlays.OSD
updateGlow(); updateGlow();
FinishTransforms(true); FinishTransforms(true);
} }
private void updateGlow()
{
if (glowing)
{
fill.FadeColour(glowingColour, transition_speed, Easing.OutQuint);
FadeEdgeEffectTo(glow_strength, transition_speed, Easing.OutQuint);
}
else
{
FadeEdgeEffectTo(0, transition_speed, Easing.OutQuint);
fill.FadeColour(idleColour, transition_speed, Easing.OutQuint);
}
}
} }
} }
} }