1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 20:22:55 +08:00

Merge remote-tracking branch 'upstream/master' into disallow-beatmap-change

This commit is contained in:
Dean Herbert 2018-06-07 16:35:07 +09:00
commit e6158bc348

View File

@ -326,7 +326,10 @@ namespace osu.Game.Screens.Menu
logoTracking = false;
if (game != null)
game.OverlayActivationMode.Value = state == MenuState.Exit ? OverlayActivation.Disabled : OverlayActivation.UserTriggered;
{
game.OverlayActivationMode.Value = state == MenuState.Exit ? OverlayActivation.Disabled : OverlayActivation.All;
game.Toolbar.Hide();
}
logo.ClearTransforms(targetMember: nameof(Position));
logo.RelativePositionAxes = Axes.Both;