h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 02:42:54 +08:00
Code Issues Releases Wiki Activity

Move background chooser to header

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game/Screens/Edit/Setup/BackgroundChooser.cs
View File

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

5
osu.Game/Screens/Edit/Setup/ResourcesSection.cs
View File

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

20
osu.Game/Screens/Edit/Setup/SetupScreenHeader.cs
View File

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