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

Change FooterV2.cs colour to use ColourProvider instead of OsuColour.

Browse Source 
Remove unnecessary `FillFlowContainer`
This commit is contained in:
mk56-spn 2023-02-13 22:07:09 +01:00
parent 4ec46c7476
commit 6e6421caea
2 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Game.Tests/Visual/SongSelect/TestSceneSongSelectFooterV2.cs
View File

@ -24,6 +24,9 @@ namespace osu.Game.Tests.Visual.SongSelect
private DummyOverlay overlay = null!; private DummyOverlay overlay = null!;
[Cached]
private OverlayColourProvider colourProvider { get; set; } = new OverlayColourProvider(OverlayColourScheme.Aquamarine);
[SetUp] [SetUp]
public void SetUp() => Schedule(() => public void SetUp() => Schedule(() =>
{ {

25
osu.Game/Screens/Select/FooterV2/FooterV2.cs
View File

@ -8,6 +8,7 @@ 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.UserInterface; using osu.Game.Graphics.UserInterface;
using osu.Game.Overlays;
using osuTK; using osuTK;
namespace osu.Game.Screens.Select.FooterV2 namespace osu.Game.Screens.Select.FooterV2
@ -48,7 +49,7 @@ namespace osu.Game.Screens.Select.FooterV2
private FillFlowContainer<FooterButtonV2> buttons = null!; private FillFlowContainer<FooterButtonV2> buttons = null!;
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuColour colour) private void load(OverlayColourProvider colourProvider)
{ {
RelativeSizeAxes = Axes.X; RelativeSizeAxes = Axes.X;
Height = height; Height = height;
@ -57,28 +58,16 @@ namespace osu.Game.Screens.Select.FooterV2
new Box new Box
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Colour = colour.B5 Colour = colourProvider.Background5
}, },
new FillFlowContainer buttons = new FillFlowContainer<FooterButtonV2>
{ {
Position = new Vector2(TwoLayerButton.SIZE_EXTENDED.X + padding, 10),
Anchor = Anchor.BottomLeft, Anchor = Anchor.BottomLeft,
Origin = Anchor.BottomLeft, Origin = Anchor.BottomLeft,
Position = new Vector2(TwoLayerButton.SIZE_EXTENDED.X + padding, 10),
RelativeSizeAxes = Axes.Y,
AutoSizeAxes = Axes.X,
Direction = FillDirection.Horizontal, Direction = FillDirection.Horizontal,
Spacing = new Vector2(padding, 0), Spacing = new Vector2(-FooterButtonV2.SHEAR_WIDTH + 7, 0),
Children = new Drawable[] AutoSizeAxes = Axes.Both
{
buttons = new FillFlowContainer<FooterButtonV2>
{
Anchor = Anchor.BottomLeft,
Origin = Anchor.BottomLeft,
Direction = FillDirection.Horizontal,
Spacing = new Vector2(-FooterButtonV2.SHEAR_WIDTH + 7, 0),
AutoSizeAxes = Axes.Both
}
}
} }
}; };
} }