h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 06:47:24 +08:00
Code Issues Releases Wiki Activity

Clean up unnecessary complexity

Browse Source
This commit is contained in:
Dean Herbert 2022-01-04 16:58:32 +09:00
parent 1c899e4402
commit db58f5de8e
3 changed files with 56 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,20 +15,16 @@ namespace osu.Game.Graphics.UserInterface.PageSelector
public bool Selected
{
get => selected.Value;
set => selected.Value = value;
}
public int Page { get; private set; }
public int Page { get; }
private OsuSpriteText text;
public DrawablePage(int page)
{
Page = page;
text.Text = page.ToString();
Background.Alpha = 0;
Action = () =>
{
@ -40,12 +36,14 @@ namespace osu.Game.Graphics.UserInterface.PageSelector
protected override Drawable CreateContent() => text = new OsuSpriteText
{
Font = OsuFont.GetFont(size: 12),
Text = Page.ToString(),
};
[BackgroundDependencyLoader]
private void load()
{
Background.Colour = Colours.Lime;
Background.Alpha = 0;
}
protected override void LoadComplete()

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

@ -1,61 +1,64 @@
// 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.
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics;
using osu.Framework.Allocation;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Extensions.Color4Extensions;
using osu.Game.Graphics.Sprites;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Graphics.Sprites;
using osuTK.Graphics;
using osu.Game.Graphics.Sprites;
using osuTK;
using osu.Framework.Extensions.IEnumerableExtensions;
using osuTK.Graphics;
namespace osu.Game.Graphics.UserInterface.PageSelector
{
public class PageSelectorButton : PageSelectorItem
{
private readonly Box fadeBox;
private readonly string text;
private Box fadeBox;
private SpriteIcon icon;
private OsuSpriteText name;
private FillFlowContainer buttonContent;
private readonly Anchor alignment;
public PageSelectorButton(bool rightAligned, string text)
{
Add(fadeBox = new Box
{
RelativeSizeAxes = Axes.Both,
Colour = Color4.Black.Opacity(100)
});
var alignment = rightAligned ? Anchor.x0 : Anchor.x2;
buttonContent.ForEach(drawable =>
{
drawable.Anchor = Anchor.y1 | alignment;
drawable.Origin = Anchor.y1 | alignment;
});
icon.Icon = alignment == Anchor.x2 ? FontAwesome.Solid.ChevronLeft : FontAwesome.Solid.ChevronRight;
name.Text = text.ToUpper();
this.text = text;
alignment = rightAligned ? Anchor.x0 : Anchor.x2;
}
protected override Drawable CreateContent() => buttonContent = new FillFlowContainer
protected override Drawable CreateContent() => new Container
{
AutoSizeAxes = Axes.Both,
Direction = FillDirection.Horizontal,
Spacing = new Vector2(3, 0),
RelativeSizeAxes = Axes.Y,
AutoSizeAxes = Axes.X,
Children = new Drawable[]
{
name = new OsuSpriteText
new FillFlowContainer
{
Font = OsuFont.GetFont(size: 12),
},
icon = new SpriteIcon
{
Size = new Vector2(8),
AutoSizeAxes = Axes.Both,
Direction = FillDirection.Horizontal,
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Spacing = new Vector2(3, 0),
Children = new Drawable[]
{
name = new OsuSpriteText
{
Font = OsuFont.GetFont(size: 12),
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Text = text.ToUpper(),
},
icon = new SpriteIcon
{
Icon = alignment == Anchor.x2 ? FontAwesome.Solid.ChevronLeft : FontAwesome.Solid.ChevronRight,
Size = new Vector2(8),
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
},
}
},
}
};
@ -70,6 +73,13 @@ namespace osu.Game.Graphics.UserInterface.PageSelector
protected override void LoadComplete()
{
base.LoadComplete();
CircularContent.Add(fadeBox = new Box
{
RelativeSizeAxes = Axes.Both,
Colour = Color4.Black.Opacity(100)
});
Enabled.BindValueChanged(enabled => fadeBox.FadeTo(enabled.NewValue ? 0 : 1, DURATION), true);
}

12
osu.Game/Graphics/UserInterface/PageSelector/PageSelectorItem.cs
View File

@ -18,16 +18,20 @@ namespace osu.Game.Graphics.UserInterface.PageSelector
[Resolved]
protected OsuColour Colours { get; private set; }
protected override Container<Drawable> Content => content;
protected Box Background;
protected readonly Box Background;
private readonly CircularContainer content;
public CircularContainer CircularContent { get; private set; }
protected PageSelectorItem()
{
AutoSizeAxes = Axes.X;
Height = 20;
base.Content.Add(content = new CircularContainer
}
[BackgroundDependencyLoader]
private void load()
{
Add(CircularContent = new CircularContainer
{
RelativeSizeAxes = Axes.Y,
AutoSizeAxes = Axes.X,