Confine available area for HUD components to excluse the song progress area

This commit is contained in:
Dean Herbert 2020-10-14 18:15:29 +09:00
parent 205c6606a7
commit ace9fbc8d3

View File

@ -80,26 +80,49 @@ namespace osu.Game.Screens.Play
visibilityContainer = new Container visibilityContainer = new Container
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Children = new Drawable[] Child = new GridContainer
{ {
HealthDisplay = CreateHealthDisplay(), RelativeSizeAxes = Axes.Both,
topScoreContainer = new Container Content = new[]
{ {
Anchor = Anchor.TopCentre, new Drawable[]
Origin = Anchor.TopCentre,
AutoSizeAxes = Axes.Both,
Children = new Drawable[]
{ {
AccuracyCounter = CreateAccuracyCounter(), new Container
ScoreCounter = CreateScoreCounter(), {
ComboCounter = CreateComboCounter(), RelativeSizeAxes = Axes.Both,
Children = new Drawable[]
{
HealthDisplay = CreateHealthDisplay(),
topScoreContainer = new Container
{
Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre,
AutoSizeAxes = Axes.Both,
Children = new Drawable[]
{
AccuracyCounter = CreateAccuracyCounter(),
ScoreCounter = CreateScoreCounter(),
ComboCounter = CreateComboCounter(),
},
},
ComboCounter = CreateComboCounter(),
ModDisplay = CreateModsContainer(),
HitErrorDisplay = CreateHitErrorDisplayOverlay(),
PlayerSettingsOverlay = CreatePlayerSettingsOverlay(),
}
},
}, },
new Drawable[]
{
Progress = CreateProgress(),
}
}, },
Progress = CreateProgress(), RowDimensions = new[]
ModDisplay = CreateModsContainer(), {
HitErrorDisplay = CreateHitErrorDisplayOverlay(), new Dimension(GridSizeMode.Distributed),
PlayerSettingsOverlay = CreatePlayerSettingsOverlay(), new Dimension(GridSizeMode.AutoSize)
} }
},
}, },
new FillFlowContainer new FillFlowContainer
{ {