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

Merge pull request #5496 from peppy/revert-broke

Browse Source 
Revert "Fix BackButton handling escape before all other elements (#54…
This commit is contained in:
Dean Herbert 2019-07-28 23:39:29 +09:00 committed by GitHub
commit f9b9eb5530
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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 @@ namespace osu.Game
screenContainer = new ScalingContainer(ScalingMode.ExcludeOverlays) screenContainer = new ScalingContainer(ScalingMode.ExcludeOverlays)
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Children = new[] Children = new Drawable[]
{ {
screenStack = new OsuScreenStack { RelativeSizeAxes = Axes.Both },
backButton = new BackButton backButton = new BackButton
{ {
Anchor = Anchor.BottomLeft, Anchor = Anchor.BottomLeft,
@ -416,8 +417,6 @@ namespace osu.Game
screenStack.Exit(); screenStack.Exit();
} }
}, },
screenStack = new OsuScreenStack { RelativeSizeAxes = Axes.Both },
backButton.CreateProxy(),
logoContainer = new Container { RelativeSizeAxes = Axes.Both }, logoContainer = new Container { RelativeSizeAxes = Axes.Both },
} }
}, },

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

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