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

Move overlay colour provider up to editor screen

Browse Source
This commit is contained in:
Bartłomiej Dach 2021-08-28 18:50:13 +02:00
parent e94d96f250
commit fcc3e57d5d
No known key found for this signature in database
GPG Key ID: BCECCD4FA41F6497
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game/Screens/Edit/EditorRoundedScreen.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.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Overlays;
namespace osu.Game.Screens.Edit namespace osu.Game.Screens.Edit
{ {
@ -17,9 +16,6 @@ namespace osu.Game.Screens.Edit
[Resolved] [Resolved]
private OsuColour colours { get; set; } private OsuColour colours { get; set; }
[Cached]
protected readonly OverlayColourProvider ColourProvider;
private Container roundedContent; private Container roundedContent;
protected override Container<Drawable> Content => roundedContent; protected override Container<Drawable> Content => roundedContent;
@ -27,7 +23,6 @@ namespace osu.Game.Screens.Edit
public EditorRoundedScreen(EditorScreenMode mode) public EditorRoundedScreen(EditorScreenMode mode)
: base(mode) : base(mode)
{ {
ColourProvider = new OverlayColourProvider(OverlayColourScheme.Blue);
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]

6
osu.Game/Screens/Edit/EditorScreen.cs
View File

@ -5,6 +5,7 @@ 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.Cursor; using osu.Framework.Graphics.Cursor;
using osu.Game.Overlays;
namespace osu.Game.Screens.Edit namespace osu.Game.Screens.Edit
{ {
@ -16,6 +17,9 @@ namespace osu.Game.Screens.Edit
[Resolved] [Resolved]
protected EditorBeatmap EditorBeatmap { get; private set; } protected EditorBeatmap EditorBeatmap { get; private set; }
[Cached]
protected readonly OverlayColourProvider ColourProvider;
protected override Container<Drawable> Content => content; protected override Container<Drawable> Content => content;
private readonly Container content; private readonly Container content;
@ -29,6 +33,8 @@ namespace osu.Game.Screens.Edit
Origin = Anchor.Centre; Origin = Anchor.Centre;
RelativeSizeAxes = Axes.Both; RelativeSizeAxes = Axes.Both;
ColourProvider = new OverlayColourProvider(OverlayColourScheme.Blue);
InternalChild = content = new PopoverContainer { RelativeSizeAxes = Axes.Both }; InternalChild = content = new PopoverContainer { RelativeSizeAxes = Axes.Both };
} }