1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 12:42:54 +08:00

Move background chooser to header

This commit is contained in:
Bartłomiej Dach 2021-04-03 20:21:36 +02:00
parent 61f9eb51c4
commit 294d911426
3 changed files with 18 additions and 12 deletions

View File

@ -44,8 +44,7 @@ namespace osu.Game.Screens.Edit.Setup
InternalChild = content = new Container
{
RelativeSizeAxes = Axes.Both,
Masking = true,
CornerRadius = 10,
Masking = true
};
}
@ -133,7 +132,7 @@ namespace osu.Game.Screens.Edit.Setup
Text = "Drag image here to set beatmap background!",
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
AutoSizeAxes = Axes.X,
AutoSizeAxes = Axes.Both
}
};
}

View File

@ -54,11 +54,6 @@ namespace osu.Game.Screens.Edit.Setup
Children = new Drawable[]
{
new BackgroundChooser
{
RelativeSizeAxes = Axes.X,
Height = 250,
},
audioTrackTextBox = new FileChooserLabelledTextBox
{
Label = "Audio Track",

View File

@ -25,12 +25,24 @@ namespace osu.Game.Screens.Edit.Setup
{
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
// reverse flow is used to ensure that the tab control's expandable bars extend over the background chooser.
Child = new ReverseChildIDFillFlowContainer<Drawable>
{
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Direction = FillDirection.Vertical,
Children = new Drawable[]
{
tabControl = new SetupScreenTabControl
{
RelativeSizeAxes = Axes.X,
Height = 30
},
new BackgroundChooser
{
RelativeSizeAxes = Axes.X,
Height = 120
}
}
}
};