sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-05 07:33:55 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into display-accuracy

Browse Source
This commit is contained in:
recapitalverb
2020-02-04 11:39:47 +07:00
committed by GitHub
parent 2bbd12e39a ba81a4c82f
commit 79bb476f4c
10 changed files with 233 additions and 274 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
osu.Game/Screens/Select/SongSelect.cs
View File

@ -224,23 +224,37 @@ namespace osu.Game.Screens.Select
if (ShowFooter)
{
AddRangeInternal(new[]
AddRangeInternal(new Drawable[]
{
FooterPanels = new Container
new GridContainer // used for max height implementation
{
Anchor = Anchor.BottomLeft,
Origin = Anchor.BottomLeft,
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Margin = new MarginPadding { Bottom = Footer.HEIGHT },
Children = new Drawable[]
RelativeSizeAxes = Axes.Both,
RowDimensions = new[]
{
BeatmapOptions = new BeatmapOptionsOverlay(),
ModSelect = new ModSelectOverlay
new Dimension(),
new Dimension(GridSizeMode.Relative, 1f, maxSize: ModSelectOverlay.HEIGHT + Footer.HEIGHT),
},
Content = new[]
{
null,
new Drawable[]
{
RelativeSizeAxes = Axes.X,
Origin = Anchor.BottomCentre,
Anchor = Anchor.BottomCentre,
FooterPanels = new Container
{
Anchor = Anchor.BottomLeft,
Origin = Anchor.BottomLeft,
RelativeSizeAxes = Axes.Both,
Padding = new MarginPadding { Bottom = Footer.HEIGHT },
Children = new Drawable[]
{
BeatmapOptions = new BeatmapOptionsOverlay(),
ModSelect = new ModSelectOverlay
{
Origin = Anchor.BottomCentre,
Anchor = Anchor.BottomCentre,
}
}
}
}
}
},