Fix notifications appearing too early in load process

This commit is contained in:
Dean Herbert
2018-08-23 11:20:20 +09:00
parent de31187de6
commit 9f3f07df2e
3 changed files with 9 additions and 12 deletions

View File

@ -174,6 +174,9 @@ namespace osu.Game.Screens.Menu
ButtonSystemState lastState = state;
state = value;
if (game != null)
game.OverlayActivationMode.Value = state == ButtonSystemState.Exit ? OverlayActivation.Disabled : OverlayActivation.All;
updateLogoState(lastState);
Logger.Log($"{nameof(ButtonSystem)}'s state changed from {lastState} to {state}");
@ -205,11 +208,7 @@ namespace osu.Game.Screens.Menu
{
logoTracking = false;
if (game != null)
{
game.OverlayActivationMode.Value = state == ButtonSystemState.Exit ? OverlayActivation.Disabled : OverlayActivation.All;
game.Toolbar.Hide();
}
game?.Toolbar.Hide();
logo.ClearTransforms(targetMember: nameof(Position));
logo.RelativePositionAxes = Axes.Both;
@ -243,11 +242,7 @@ namespace osu.Game.Screens.Menu
if (impact)
logo.Impact();
if (game != null)
{
game.OverlayActivationMode.Value = OverlayActivation.All;
game.Toolbar.State = Visibility.Visible;
}
game?.Toolbar.Show();
}, 200);
break;
default: