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

Revert "Fix BackButton handling escape before all other elements (#5440)" 

This reverts commit 17a6563f4c.
This commit is contained in:
Dean Herbert 2019-07-28 15:32:29 +09:00
parent 17a6563f4c
commit 088c04a20f
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game/OsuGame.cs
View File

@ -404,8 +404,9 @@ protected override void LoadComplete()
screenContainer = new ScalingContainer(ScalingMode.ExcludeOverlays)
{
RelativeSizeAxes = Axes.Both,
Children = new[]
Children = new Drawable[]
{
screenStack = new OsuScreenStack { RelativeSizeAxes = Axes.Both },
backButton = new BackButton
{
Anchor = Anchor.BottomLeft,
@ -416,8 +417,6 @@ protected override void LoadComplete()
screenStack.Exit();
}
},
screenStack = new OsuScreenStack { RelativeSizeAxes = Axes.Both },
backButton.CreateProxy(),
logoContainer = new Container { RelativeSizeAxes = Axes.Both },
}
},

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

@ -9,6 +9,7 @@
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Input.Events;
using osu.Game.Graphics.UserInterface;
namespace osu.Game.Screens.Select
@ -102,5 +103,9 @@ public Footer()
updateModeLight();
}
protected override bool OnMouseDown(MouseDownEvent e) => true;
protected override bool OnClick(ClickEvent e) => true;
}
}