h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-06 07:42:55 +08:00
Code Issues Releases Wiki Activity

Use OverlayColourProvider

Browse Source
This commit is contained in:
Andrei Zavatski 2020-01-27 12:55:19 +03:00
parent 20268ba45b
commit 79cdfc6dc2
4 changed files with 35 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
osu.Game.Tests/Visual/Online/TestSceneUserProfileScores.cs
View File

@ -12,6 +12,8 @@ using osuTK;
using osu.Game.Beatmaps; using osu.Game.Beatmaps;
using osu.Game.Rulesets.Mods; using osu.Game.Rulesets.Mods;
using osu.Game.Rulesets.Osu.Mods; using osu.Game.Rulesets.Osu.Mods;
using osu.Game.Overlays;
using osu.Framework.Allocation;
namespace osu.Game.Tests.Visual.Online namespace osu.Game.Tests.Visual.Online
{ {
@ -74,11 +76,26 @@ namespace osu.Game.Tests.Visual.Online
Spacing = new Vector2(0, 10), Spacing = new Vector2(0, 10),
Children = new[] Children = new[]
{ {
new DrawableProfileScore(score), new ColourProvidedContainer(OverlayColourScheme.Green, new DrawableProfileScore(score)),
new DrawableProfileScore(noPPScore), new ColourProvidedContainer(OverlayColourScheme.Pink, new DrawableProfileScore(noPPScore)),
new DrawableProfileWeightedScore(score, 0.85), new ColourProvidedContainer(OverlayColourScheme.Pink, new DrawableProfileWeightedScore(score, 0.85))
} }
}); });
} }
private class ColourProvidedContainer : Container
{
[Cached]
private readonly OverlayColourProvider colourProvider;
public ColourProvidedContainer(OverlayColourScheme colourScheme, DrawableProfileScore score)
{
colourProvider = new OverlayColourProvider(colourScheme);
AutoSizeAxes = Axes.Y;
RelativeSizeAxes = Axes.X;
Add(score);
}
}
} }
} }

5
osu.Game.Tests/Visual/Online/TestSceneUserRanks.cs
View File

@ -4,11 +4,13 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using NUnit.Framework; using NUnit.Framework;
using osu.Framework.Allocation;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes; using osu.Framework.Graphics.Shapes;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Graphics.Containers; using osu.Game.Graphics.Containers;
using osu.Game.Overlays;
using osu.Game.Overlays.Profile.Sections; using osu.Game.Overlays.Profile.Sections;
using osu.Game.Overlays.Profile.Sections.Ranks; using osu.Game.Overlays.Profile.Sections.Ranks;
using osu.Game.Users; using osu.Game.Users;
@ -27,6 +29,9 @@ namespace osu.Game.Tests.Visual.Online
typeof(RanksSection) typeof(RanksSection)
}; };
[Cached]
private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Green);
public TestSceneUserRanks() public TestSceneUserRanks()
{ {
RanksSection ranks; RanksSection ranks;

7
osu.Game/Overlays/Profile/Sections/ProfileItemContainer.cs
View File

@ -6,7 +6,6 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes; using osu.Framework.Graphics.Shapes;
using osu.Framework.Input.Events; using osu.Framework.Input.Events;
using osu.Game.Graphics;
using osuTK.Graphics; using osuTK.Graphics;
namespace osu.Game.Overlays.Profile.Sections namespace osu.Game.Overlays.Profile.Sections
@ -43,10 +42,10 @@ namespace osu.Game.Overlays.Profile.Sections
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuColour colours) private void load(OverlayColourProvider colourProvider)
{ {
background.Colour = idleColour = colours.GreySeafoam; background.Colour = idleColour = colourProvider.Background4;
hoverColour = colours.GreySeafoamLight; hoverColour = colourProvider.Background3;
} }
protected override bool OnHover(HoverEvent e) protected override bool OnHover(HoverEvent e)

11
osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
View File

@ -30,6 +30,9 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
[Resolved] [Resolved]
private OsuColour colours { get; set; } private OsuColour colours { get; set; }
[Resolved]
private OverlayColourProvider colourProvider { get; set; }
public DrawableProfileScore(ScoreInfo score) public DrawableProfileScore(ScoreInfo score)
{ {
Score = score; Score = score;
@ -91,7 +94,7 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
}, },
new DrawableDate(Score.Date, 12) new DrawableDate(Score.Date, 12)
{ {
Colour = colours.GreySeafoamLighter Colour = colourProvider.Foreground1
} }
} }
} }
@ -192,7 +195,7 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
Origin = Anchor.BottomLeft, Origin = Anchor.BottomLeft,
Font = OsuFont.GetFont(weight: FontWeight.Bold), Font = OsuFont.GetFont(weight: FontWeight.Bold),
Text = $"{Score.PP:0}", Text = $"{Score.PP:0}",
Colour = colours.GreenLight Colour = colourProvider.Highlight1
}, },
new OsuSpriteText new OsuSpriteText
{ {
@ -200,7 +203,7 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
Origin = Anchor.BottomLeft, Origin = Anchor.BottomLeft,
Font = OsuFont.GetFont(size: 12, weight: FontWeight.Bold), Font = OsuFont.GetFont(size: 12, weight: FontWeight.Bold),
Text = "pp", Text = "pp",
Colour = colours.Green Colour = colourProvider.Light3
} }
} }
}; };
@ -210,7 +213,7 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
{ {
Font = OsuFont.GetFont(weight: FontWeight.Bold), Font = OsuFont.GetFont(weight: FontWeight.Bold),
Text = "-", Text = "-",
Colour = colours.GreenLight Colour = colourProvider.Highlight1
}; };
} }