sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-02 00:40:09 +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

9
osu.Game/Overlays/TabControlOverlayHeader.cs
View File

@ -23,8 +23,7 @@ namespace osu.Game.Overlays
private readonly Box controlBackground;
protected TabControlOverlayHeader(OverlayColourScheme colourScheme)
: base(colourScheme)
protected TabControlOverlayHeader()
{
HeaderInfo.Add(new Container
{
@ -42,10 +41,10 @@ namespace osu.Game.Overlays
}
[BackgroundDependencyLoader]
private void load(OsuColour colours)
private void load(OverlayColourProvider colourProvider)
{
TabControl.AccentColour = colours.ForOverlayElement(ColourScheme, 1, 0.75f);
controlBackground.Colour = colours.ForOverlayElement(ColourScheme, 0.2f, 0.2f);
TabControl.AccentColour = colourProvider.Highlight1;
controlBackground.Colour = colourProvider.Dark4;
}
[NotNull]