h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-11 23:13:06 +08:00
Code Issues Releases Wiki Activity

Merge pull request #25377 from bdach/system-mod-better-colours

Browse Source
This commit is contained in:
Dean Herbert 2023-11-07 05:08:47 +09:00 committed by GitHub
commit ed02335e3e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Graphics/OsuColour.cs
View File

@ -162,7 +162,7 @@ namespace osu.Game.Graphics
return Pink1;
case ModType.System:
return Gray7;
return Yellow;
default:
throw new ArgumentOutOfRangeException(nameof(modType), modType, "Unknown mod type");

4
osu.Game/Rulesets/UI/ModIcon.cs
View File

@ -138,7 +138,6 @@ namespace osu.Game.Rulesets.UI
{
Origin = Anchor.Centre,
Anchor = Anchor.Centre,
Colour = OsuColour.Gray(84),
Alpha = 0,
Font = OsuFont.Numeric.With(null, 22f),
UseFullGlyphHeight = false,
@ -148,7 +147,6 @@ namespace osu.Game.Rulesets.UI
{
Origin = Anchor.Centre,
Anchor = Anchor.Centre,
Colour = OsuColour.Gray(84),
Size = new Vector2(45),
Icon = FontAwesome.Solid.Question
},
@ -206,6 +204,8 @@ namespace osu.Game.Rulesets.UI
private void updateColour()
{
modAcronym.Colour = modIcon.Colour = OsuColour.Gray(84);
extendedText.Colour = background.Colour = Selected.Value ? backgroundColour.Lighten(0.2f) : backgroundColour;
extendedBackground.Colour = Selected.Value ? backgroundColour.Darken(2.4f) : backgroundColour.Darken(2.8f);
}

6
osu.Game/Rulesets/UI/ModSwitchSmall.cs
View File

@ -85,11 +85,13 @@ namespace osu.Game.Rulesets.UI
tinySwitch.Scale = new Vector2(0.3f);
}
var modTypeColour = colours.ForModType(mod.Type);
inactiveForegroundColour = colourProvider?.Background5 ?? colours.Gray3;
activeForegroundColour = colours.ForModType(mod.Type);
activeForegroundColour = modTypeColour;
inactiveBackgroundColour = colourProvider?.Background2 ?? colours.Gray5;
activeBackgroundColour = Interpolation.ValueAt<Colour4>(0.1f, Colour4.Black, activeForegroundColour, 0, 1);
activeBackgroundColour = Interpolation.ValueAt<Colour4>(0.1f, Colour4.Black, modTypeColour, 0, 1);
}
protected override void LoadComplete()

6
osu.Game/Rulesets/UI/ModSwitchTiny.cs
View File

@ -106,11 +106,13 @@ namespace osu.Game.Rulesets.UI
[BackgroundDependencyLoader(true)]
private void load(OsuColour colours, OverlayColourProvider? colourProvider)
{
var modTypeColour = colours.ForModType(Mod.Type);
inactiveBackgroundColour = colourProvider?.Background5 ?? colours.Gray3;
activeBackgroundColour = colours.ForModType(Mod.Type);
activeBackgroundColour = modTypeColour;
inactiveForegroundColour = colourProvider?.Background2 ?? colours.Gray5;
activeForegroundColour = Interpolation.ValueAt<Colour4>(0.1f, Colour4.Black, activeForegroundColour, 0, 1);
activeForegroundColour = Interpolation.ValueAt<Colour4>(0.1f, Colour4.Black, modTypeColour, 0, 1);
}
protected override void LoadComplete()