h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-03-21 21:47:20 +08:00
Code Issues Releases Wiki Activity

Merge branch 'master' into spin-in

Browse Source
This commit is contained in:
Dean Herbert 2019-07-29 01:01:20 +09:00 committed by GitHub
commit f09e7d53e1
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)
{
RelativeSizeAxes = Axes.Both,
Children = new[]
Children = new Drawable[]
{
screenStack = new OsuScreenStack { RelativeSizeAxes = Axes.Both },
backButton = new BackButton
{
Anchor = Anchor.BottomLeft,
@ -416,8 +417,6 @@ namespace osu.Game
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.Extensions.Color4Extensions;
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 @@ namespace osu.Game.Screens.Select
updateModeLight();
}
protected override bool OnMouseDown(MouseDownEvent e) => true;
protected override bool OnClick(ClickEvent e) => true;
}
}