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

Add new container level and unblock footer

Browse Source
This commit is contained in:
David Zhao 2019-07-25 11:11:20 +09:00
parent da3dc610ba
commit bbcc8f0721
2 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
osu.Game/OsuGame.cs
View File

@ -395,16 +395,6 @@ namespace osu.Game
AddRange(new Drawable[]
{
backButton = new BackButton
{
Anchor = Anchor.BottomLeft,
Origin = Anchor.BottomLeft,
Action = () =>
{
if ((screenStack.CurrentScreen as IOsuScreen)?.AllowBackButton == true)
screenStack.Exit();
}
},
new VolumeControlReceptor
{
RelativeSizeAxes = Axes.Both,
@ -412,6 +402,21 @@ namespace osu.Game
ScrollActionRequested = (action, amount, isPrecise) => volume.Adjust(action, amount, isPrecise),
},
screenContainer = new ScalingContainer(ScalingMode.ExcludeOverlays)
{
RelativeSizeAxes = Axes.Both,
Children = new[]
{
backButton = new BackButton
{
Anchor = Anchor.BottomLeft,
Origin = Anchor.BottomLeft,
Action = () =>
{
if ((screenStack.CurrentScreen as IOsuScreen)?.AllowBackButton == true)
screenStack.Exit();
}
},
new Container
{
RelativeSizeAxes = Axes.Both,
Children = new[]
@ -420,6 +425,8 @@ namespace osu.Game
backButton.CreateProxy(),
logoContainer = new Container { RelativeSizeAxes = Axes.Both },
}
}
}
},
overlayContent = new Container { RelativeSizeAxes = Axes.Both },
rightFloatingOverlayContent = new Container { RelativeSizeAxes = Axes.Both },

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

@ -104,8 +104,8 @@ namespace osu.Game.Screens.Select
updateModeLight();
}
protected override bool OnMouseDown(MouseDownEvent e) => true;
protected override bool OnMouseDown(MouseDownEvent e) => false;
protected override bool OnClick(ClickEvent e) => true;
protected override bool OnClick(ClickEvent e) => false;
}
}