h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-28 04:42:58 +08:00
Code Issues Releases Wiki Activity

Fix post-merge issues

Browse Source
This commit is contained in:
Dean Herbert 2022-01-04 16:46:42 +09:00
parent 69e7ee0f48
commit 1c899e4402
4 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
osu.Game.Tests/Visual/UserInterface/TestScenePageSelector.cs
View File

@ -1,8 +1,6 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
using System;
using System.Collections.Generic;
using NUnit.Framework; using NUnit.Framework;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Game.Graphics.UserInterface.PageSelector; using osu.Game.Graphics.UserInterface.PageSelector;
@ -11,14 +9,6 @@ namespace osu.Game.Tests.Visual.UserInterface
{ {
public class TestScenePageSelector : OsuTestScene public class TestScenePageSelector : OsuTestScene
{ {
public override IReadOnlyList<Type> RequiredTypes => new[]
{
typeof(PageSelector),
typeof(DrawablePage),
typeof(PageSelectorButton),
typeof(PageSelectorItem)
};
private readonly PageSelector pageSelector; private readonly PageSelector pageSelector;
private readonly DrawablePage drawablePage; private readonly DrawablePage drawablePage;

2
osu.Game/Graphics/UserInterface/PageSelector/DrawablePage.cs
View File

@ -57,7 +57,7 @@ namespace osu.Game.Graphics.UserInterface.PageSelector
private void onSelectedChanged(ValueChangedEvent<bool> selected) private void onSelectedChanged(ValueChangedEvent<bool> selected)
{ {
Background.FadeTo(selected.NewValue ? 1 : 0, DURATION, Easing.OutQuint); Background.FadeTo(selected.NewValue ? 1 : 0, DURATION, Easing.OutQuint);
text.FadeColour(selected.NewValue ? Colours.GreySeafoamDarker : Colours.Lime, DURATION, Easing.OutQuint); text.FadeColour(selected.NewValue ? Colours.GreySeaFoamDarker : Colours.Lime, DURATION, Easing.OutQuint);
} }
protected override void UpdateHoverState() protected override void UpdateHoverState()

1
osu.Game/Graphics/UserInterface/PageSelector/PageSelector.cs
View File

@ -21,6 +21,7 @@ namespace osu.Game.Graphics.UserInterface.PageSelector
public PageSelector() public PageSelector()
{ {
AutoSizeAxes = Axes.Both; AutoSizeAxes = Axes.Both;
InternalChild = new FillFlowContainer InternalChild = new FillFlowContainer
{ {
AutoSizeAxes = Axes.Both, AutoSizeAxes = Axes.Both,

4
osu.Game/Graphics/UserInterface/PageSelector/PageSelectorButton.cs
View File

@ -63,7 +63,7 @@ namespace osu.Game.Graphics.UserInterface.PageSelector
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load() private void load()
{ {
Background.Colour = Colours.GreySeafoamDark; Background.Colour = Colours.GreySeaFoamDark;
name.Colour = icon.Colour = Colours.Lime; name.Colour = icon.Colour = Colours.Lime;
} }
@ -73,6 +73,6 @@ namespace osu.Game.Graphics.UserInterface.PageSelector
Enabled.BindValueChanged(enabled => fadeBox.FadeTo(enabled.NewValue ? 0 : 1, DURATION), true); Enabled.BindValueChanged(enabled => fadeBox.FadeTo(enabled.NewValue ? 0 : 1, DURATION), true);
} }
protected override void UpdateHoverState() => Background.FadeColour(IsHovered ? Colours.GreySeafoam : Colours.GreySeafoamDark, DURATION, Easing.OutQuint); protected override void UpdateHoverState() => Background.FadeColour(IsHovered ? Colours.GreySeaFoam : Colours.GreySeaFoamDark, DURATION, Easing.OutQuint);
} }
} }