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

Make overlay elements use OverlayColourProvider

Browse Source
This commit is contained in:
Andrei Zavatski
2020-01-24 12:33:34 +03:00
parent db4cd51d02
commit e03a085d70
7 changed files with 10 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
osu.Game/Overlays/BreadcrumbControlOverlayHeader.cs
View File

@ -4,7 +4,6 @@
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.UserInterface; using osu.Framework.Graphics.UserInterface;
using osu.Game.Graphics;
using osu.Game.Graphics.UserInterface; using osu.Game.Graphics.UserInterface;
namespace osu.Game.Overlays namespace osu.Game.Overlays
@ -15,15 +14,10 @@ namespace osu.Game.Overlays
protected override TabControl<string> CreateTabControl() => BreadcrumbControl = new OverlayHeaderBreadcrumbControl(); protected override TabControl<string> CreateTabControl() => BreadcrumbControl = new OverlayHeaderBreadcrumbControl();
protected BreadcrumbControlOverlayHeader(OverlayColourScheme colourScheme)
: base(colourScheme)
{
}
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuColour colours) private void load(OverlayColourProvider colourProvider)
{ {
BreadcrumbControl.AccentColour = colours.ForOverlayElement(ColourScheme, 1, 0.75f); BreadcrumbControl.AccentColour = colourProvider.Highlight1;
} }
public class OverlayHeaderBreadcrumbControl : BreadcrumbControl<string> public class OverlayHeaderBreadcrumbControl : BreadcrumbControl<string>

2
osu.Game/Overlays/Changelog/ChangelogHeader.cs
View File

@ -9,7 +9,6 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Sprites; using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.Textures; using osu.Framework.Graphics.Textures;
using osu.Game.Graphics;
using osu.Game.Graphics.UserInterface; using osu.Game.Graphics.UserInterface;
using osu.Game.Online.API.Requests.Responses; using osu.Game.Online.API.Requests.Responses;
@ -26,7 +25,6 @@ namespace osu.Game.Overlays.Changelog
private const string listing_string = "listing"; private const string listing_string = "listing";
public ChangelogHeader() public ChangelogHeader()
: base(OverlayColourScheme.Purple)
{ {
BreadcrumbControl.AddItem(listing_string); BreadcrumbControl.AddItem(listing_string);
BreadcrumbControl.Current.ValueChanged += e => BreadcrumbControl.Current.ValueChanged += e =>

1
osu.Game/Overlays/News/NewsHeader.cs
View File

@ -23,7 +23,6 @@ namespace osu.Game.Overlays.News
public Action ShowFrontPage; public Action ShowFrontPage;
public NewsHeader() public NewsHeader()
: base(OverlayColourScheme.Purple)
{ {
BreadcrumbControl.AddItem(front_page_string); BreadcrumbControl.AddItem(front_page_string);

2
osu.Game/Overlays/OverlayColourProvider.cs
View File

@ -66,7 +66,7 @@ namespace osu.Game.Overlays
public Color4 Dark1 => convert(0.2f, 0.35f); public Color4 Dark1 => convert(0.2f, 0.35f);
public Color4 Dark2 => convert(0.2f, 0.3f); public Color4 Dark2 => convert(0.2f, 0.3f);
public Color4 Dark3 => convert(0.2f, 0.25f); public Color4 Dark3 => convert(0.2f, 0.25f);
public Color4 Dark4 => convert(0.2f, 0.20f); public Color4 Dark4 => convert(0.2f, 0.2f);
public Color4 Dark5 => convert(0.2f, 0.15f); public Color4 Dark5 => convert(0.2f, 0.15f);
public Color4 Dark6 => convert(0.2f, 0.1f); public Color4 Dark6 => convert(0.2f, 0.1f);
public Color4 Foreground1 => convert(0.1f, 0.6f); public Color4 Foreground1 => convert(0.1f, 0.6f);

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

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

1
osu.Game/Overlays/Profile/ProfileHeader.cs
View File

@ -24,7 +24,6 @@ namespace osu.Game.Overlays.Profile
private DetailHeaderContainer detailHeaderContainer; private DetailHeaderContainer detailHeaderContainer;
public ProfileHeader() public ProfileHeader()
: base(OverlayColourScheme.Green)
{ {
BackgroundHeight = 150; BackgroundHeight = 150;

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

@ -16,15 +16,10 @@ namespace osu.Game.Overlays
protected override TabControl<string> CreateTabControl() => TabControl = new OverlayHeaderTabControl(); protected override TabControl<string> CreateTabControl() => TabControl = new OverlayHeaderTabControl();
protected TabControlOverlayHeader(OverlayColourScheme colourScheme)
: base(colourScheme)
{
}
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuColour colours) private void load(OverlayColourProvider colourProvider)
{ {
TabControl.AccentColour = colours.ForOverlayElement(ColourScheme, 1, 0.75f); TabControl.AccentColour = colourProvider.Highlight1;
} }
public class OverlayHeaderTabControl : OverlayTabControl<string> public class OverlayHeaderTabControl : OverlayTabControl<string>