sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-03 01:09:57 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge master with conflicts resolved

Browse Source
This commit is contained in:
Andrei Zavatski
2020-01-26 16:35:07 +03:00
parent e442e8535b b424381e65
commit cd0fcfabd9
20 changed files with 160 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
osu.Game/Overlays/OverlayHeader.cs
View File

@ -25,12 +25,8 @@ namespace osu.Game.Overlays
set => background.Height = value;
}
protected OverlayColourScheme ColourScheme { get; }
protected OverlayHeader(OverlayColourScheme colourScheme)
protected OverlayHeader()
{
ColourScheme = colourScheme;
RelativeSizeAxes = Axes.X;
AutoSizeAxes = Axes.Y;
@ -85,10 +81,10 @@ namespace osu.Game.Overlays
}
[BackgroundDependencyLoader]
private void load(OsuColour colours)
private void load(OverlayColourProvider colourProvider)
{
titleBackground.Colour = colours.ForOverlayElement(ColourScheme, 0.2f, 0.15f);
title.AccentColour = colours.ForOverlayElement(ColourScheme, 1, 0.7f);
titleBackground.Colour = colourProvider.Dark5;
title.AccentColour = colourProvider.Highlight1;
}
protected abstract Drawable CreateBackground();