h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-30 01:32:55 +08:00
Code Issues Releases Wiki Activity

Tidy up song select footer and fix depth of mod select vs osu! cookie.

Browse Source
This commit is contained in:
Dean Herbert 2017-03-23 19:32:58 +09:00
parent 6e42a75fca
commit 8c4fd44a85
No known key found for this signature in database
GPG Key ID: 46D71BF4958ABB49
3 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game/Screens/Select/Footer.cs
View File

@ -22,6 +22,8 @@ namespace osu.Game.Screens.Select
private const float play_song_select_button_width = 100; private const float play_song_select_button_width = 100;
private const float play_song_select_button_height = 50; private const float play_song_select_button_height = 50;
public const float HEIGHT = 50;
public const int TRANSITION_LENGTH = 300; public const int TRANSITION_LENGTH = 300;
private const float padding = 80; private const float padding = 80;
@ -69,10 +71,8 @@ namespace osu.Game.Screens.Select
{ {
AlwaysReceiveInput = true; AlwaysReceiveInput = true;
const float bottom_tool_height = 50;
RelativeSizeAxes = Axes.X; RelativeSizeAxes = Axes.X;
Height = bottom_tool_height; Height = HEIGHT;
Anchor = Anchor.BottomCentre; Anchor = Anchor.BottomCentre;
Origin = Anchor.BottomCentre; Origin = Anchor.BottomCentre;
Children = new Drawable[] Children = new Drawable[]

3
osu.Game/Screens/Select/PlaySongSelect.cs
View File

@ -22,12 +22,11 @@ namespace osu.Game.Screens.Select
public PlaySongSelect() public PlaySongSelect()
{ {
Add(modSelect = new ModSelectOverlay FooterPanels.Add(modSelect = new ModSelectOverlay
{ {
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
Origin = Anchor.BottomCentre, Origin = Anchor.BottomCentre,
Anchor = Anchor.BottomCentre, Anchor = Anchor.BottomCentre,
Margin = new MarginPadding { Bottom = 50 }
}); });
LeftContent.Add(beatmapDetails = new BeatmapDetailArea LeftContent.Add(beatmapDetails = new BeatmapDetailArea

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

@ -65,6 +65,12 @@ namespace osu.Game.Screens.Select
/// </summary> /// </summary>
protected readonly Footer Footer; protected readonly Footer Footer;
/// <summary>
/// Contains any panel which is triggered by a footer button.
/// Helps keep them located beneath the footer itself.
/// </summary>
protected readonly Container FooterPanels;
public readonly FilterControl FilterControl; public readonly FilterControl FilterControl;
protected SongSelect() protected SongSelect()
@ -131,11 +137,15 @@ namespace osu.Game.Screens.Select
if (ShowFooter) if (ShowFooter)
{ {
Add(BeatmapOptions = new BeatmapOptionsOverlay Add(FooterPanels = new Container
{ {
Anchor = Anchor.BottomLeft,
Origin = Anchor.BottomLeft,
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Margin = new MarginPadding Margin = new MarginPadding
{ {
Bottom = 50, Bottom = Footer.HEIGHT,
}, },
}); });
Add(Footer = new Footer Add(Footer = new Footer
@ -143,6 +153,8 @@ namespace osu.Game.Screens.Select
OnBack = Exit, OnBack = Exit,
OnStart = raiseSelect, OnStart = raiseSelect,
}); });
FooterPanels.Add(BeatmapOptions = new BeatmapOptionsOverlay());
} }
} }