sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-06-08 04:48:04 +09:00
Code Issues Packages Projects Releases Wiki Activity

Use ColourProvider colours

Browse Source
This commit is contained in:
Andrei Zavatski 2020-02-03 19:44:10 +03:00
parent e531570352
commit 12574111e5
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game.Tests/Visual/Online/TestSceneRankingsSpotlightSelector.cs
View File

@ -8,6 +8,7 @@ using osu.Framework.Allocation;
using osu.Game.Online.API; using osu.Game.Online.API;
using osu.Game.Online.API.Requests; using osu.Game.Online.API.Requests;
using osu.Game.Online.API.Requests.Responses; using osu.Game.Online.API.Requests.Responses;
using osu.Game.Overlays;
using osu.Game.Overlays.Rankings; using osu.Game.Overlays.Rankings;
namespace osu.Game.Tests.Visual.Online namespace osu.Game.Tests.Visual.Online
@ -21,6 +22,9 @@ namespace osu.Game.Tests.Visual.Online
protected override bool UseOnlineAPI => true; protected override bool UseOnlineAPI => true;
[Cached]
private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Green);
[Resolved] [Resolved]
private IAPIProvider api { get; set; } private IAPIProvider api { get; set; }

14
osu.Game/Overlays/Rankings/SpotlightSelector.cs
View File

@ -83,9 +83,9 @@ namespace osu.Game.Overlays.Rankings
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuColour colours) private void load(OverlayColourProvider colourProvider)
{ {
background.Colour = colours.GreySeafoam; background.Colour = colourProvider.Dark3;
} }
protected override void LoadComplete() protected override void LoadComplete()
@ -138,9 +138,9 @@ namespace osu.Game.Overlays.Rankings
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuColour colours) private void load(OverlayColourProvider colourProvider)
{ {
valueText.Colour = colours.GreySeafoamLighter; valueText.Colour = colourProvider.Content2;
} }
} }
@ -151,10 +151,10 @@ namespace osu.Game.Overlays.Rankings
protected override DropdownMenu CreateMenu() => menu = base.CreateMenu().With(m => m.MaxHeight = 400); protected override DropdownMenu CreateMenu() => menu = base.CreateMenu().With(m => m.MaxHeight = 400);
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuColour colours) private void load(OverlayColourProvider colourProvider)
{ {
menu.BackgroundColour = colours.Gray1; menu.BackgroundColour = colourProvider.Background5;
AccentColour = colours.GreySeafoamDarker; AccentColour = colourProvider.Background6;
} }
} }
} }