RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add new container level and unblock footer

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

33
osu.Game/OsuGame.cs
View File

@ -395,16 +395,6 @@ protected override void LoadComplete()
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,
@ -416,9 +406,26 @@ protected override void LoadComplete()
RelativeSizeAxes = Axes.Both,
Children = new[]
{
screenStack = new OsuScreenStack { RelativeSizeAxes = Axes.Both },
backButton.CreateProxy(),
logoContainer = new Container { RelativeSizeAxes = Axes.Both },
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[]
{
screenStack = new OsuScreenStack { RelativeSizeAxes = Axes.Both },
backButton.CreateProxy(),
logoContainer = new Container { RelativeSizeAxes = Axes.Both },
}
}
}
},
overlayContent = new Container { RelativeSizeAxes = Axes.Both },

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

@ -104,8 +104,8 @@ public Footer()
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;
}
}