h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-06 12:17:46 +08:00
Code Issues Releases Wiki Activity

fix flowcontainer order properly and removed todo as its decided to do nothing there for now

Browse Source
This commit is contained in:
Olle Kelderman 2020-05-25 00:55:10 +02:00
parent 1062e07ec1
commit a174117880
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
osu.Game.Tournament/Screens/SetupScreen.cs
View File

@ -151,7 +151,7 @@ namespace osu.Game.Tournament.Screens
private class ActionableInfo : LabelledDrawable<Drawable> private class ActionableInfo : LabelledDrawable<Drawable>
{ {
protected OsuButton Button; private OsuButton button;
public ActionableInfo() public ActionableInfo()
: base(true) : base(true)
@ -160,7 +160,7 @@ namespace osu.Game.Tournament.Screens
public string ButtonText public string ButtonText
{ {
set => Button.Text = value; set => button.Text = value;
} }
public string Value public string Value
@ -197,7 +197,7 @@ namespace osu.Game.Tournament.Screens
Spacing = new Vector2(10, 0), Spacing = new Vector2(10, 0),
Children = new Drawable[] Children = new Drawable[]
{ {
Button = new TriangleButton button = new TriangleButton
{ {
Size = new Vector2(100, 30), Size = new Vector2(100, 30),
Action = () => Action?.Invoke() Action = () => Action?.Invoke()
@ -219,11 +219,10 @@ namespace osu.Game.Tournament.Screens
protected override Drawable CreateComponent() protected override Drawable CreateComponent()
{ {
var drawable = base.CreateComponent(); var drawable = base.CreateComponent();
FlowContainer.Insert(0, numberBox = new OsuNumberBox FlowContainer.Insert(-1, numberBox = new OsuNumberBox
{ {
Width = 100 Width = 100
}); });
FlowContainer.SetLayoutPosition(Button, 1);
base.Action = () => base.Action = () =>
{ {
@ -246,10 +245,6 @@ namespace osu.Game.Tournament.Screens
Action?.Invoke(number); Action?.Invoke(number);
} }
else
{
// TODO: input box was empty, give user feedback? do nothing?
}
}; };
return drawable; return drawable;
} }