h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-15 09:22:54 +08:00
Code Issues Releases Wiki Activity

Avoid using right-to-left fill direction for now.

Browse Source
This commit is contained in:
Dean Herbert 2017-03-03 16:54:59 +09:00
parent 47845a7fbd
commit bdb130fabc
No known key found for this signature in database
GPG Key ID: 46D71BF4958ABB49
1 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
osu.Game/Screens/Select/Options/BeatmapOptionsOverlay.cs
View File

@ -2,6 +2,8 @@
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System; using System;
using System.Collections.Generic;
using System.Linq;
using OpenTK; using OpenTK;
using OpenTK.Graphics; using OpenTK.Graphics;
using osu.Framework.Graphics; using osu.Framework.Graphics;
@ -18,6 +20,8 @@ namespace osu.Game.Screens.Select.Options
private const float transition_duration = 500; private const float transition_duration = 500;
private const float x_position = 290; private const float x_position = 290;
private const float height = 100;
private Box holder; private Box holder;
private FillFlowContainer<BeatmapOptionsButton> buttonsContainer; private FillFlowContainer<BeatmapOptionsButton> buttonsContainer;
@ -76,29 +80,20 @@ namespace osu.Game.Screens.Select.Options
Scale = new Vector2(1, 0), Scale = new Vector2(1, 0),
Colour = Color4.Black.Opacity(0.5f), Colour = Color4.Black.Opacity(0.5f),
}, },
buttonsContainer = new FillFlowContainer<BeatmapOptionsButton> buttonsContainer = new ButtonFlow
{ {
Height = height,
AutoSizeAxes = Axes.X, AutoSizeAxes = Axes.X,
Height = 100,
Origin = Anchor.BottomLeft, Origin = Anchor.BottomLeft,
Anchor = Anchor.BottomLeft, Anchor = Anchor.BottomLeft,
Direction = FillDirection.Left,
Children = new BeatmapOptionsButton[] Children = new BeatmapOptionsButton[]
{ {
new BeatmapOptionsDeleteButton new BeatmapOptionsRemoveFromUnplayedButton
{ {
Action = () => Action = () =>
{ {
Hide(); Hide();
OnDelete?.Invoke(); OnRemoveFromUnplayed?.Invoke();
},
},
new BeatmapOptionsEditButton
{
Action = () =>
{
Hide();
OnEdit?.Invoke();
}, },
}, },
new BeatmapOptionsClearLocalScoresButton new BeatmapOptionsClearLocalScoresButton
@ -109,17 +104,36 @@ namespace osu.Game.Screens.Select.Options
OnClearLocalScores?.Invoke(); OnClearLocalScores?.Invoke();
}, },
}, },
new BeatmapOptionsRemoveFromUnplayedButton new BeatmapOptionsEditButton
{ {
Action = () => Action = () =>
{ {
Hide(); Hide();
OnRemoveFromUnplayed?.Invoke(); OnEdit?.Invoke();
},
},
new BeatmapOptionsDeleteButton
{
Action = () =>
{
Hide();
OnDelete?.Invoke();
}, },
}, },
}, },
}, },
}; };
} }
class ButtonFlow : FillFlowContainer<BeatmapOptionsButton>
{
protected override IComparer<Drawable> DepthComparer => new ReverseCreationOrderDepthComparer();
protected override IEnumerable<BeatmapOptionsButton> FlowingChildren => base.FlowingChildren.Reverse();
public ButtonFlow()
{
Direction = FillDirection.Right;
}
}
} }
} }