Merge remote-tracking branch 'upstream/master' into better-notification-delays

This commit is contained in:
Dean Herbert
2017-12-26 16:10:57 +09:00
35 changed files with 386 additions and 141 deletions

View File

@ -274,7 +274,7 @@ namespace osu.Game
};
}
Action<Visibility> stateChanged = delegate
void updateScreenOffset()
{
float offset = 0;
@ -283,11 +283,11 @@ namespace osu.Game
if (notifications.State == Visibility.Visible)
offset -= ToolbarButton.WIDTH / 2;
intro.MoveToX(offset, SettingsOverlay.TRANSITION_LENGTH, Easing.OutQuint);
};
screenStack.MoveToX(offset, SettingsOverlay.TRANSITION_LENGTH, Easing.OutQuint);
}
settings.StateChanged += stateChanged;
notifications.StateChanged += stateChanged;
settings.StateChanged += _ => updateScreenOffset();
notifications.StateChanged += _ => updateScreenOffset();
notifications.Enabled.BindTo(ShowOverlays);