1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 12:47:25 +08:00

Merge branch 'master' into fix-hiding-last-map

This commit is contained in:
Dean Herbert 2017-12-26 13:32:33 +09:00 committed by GitHub
commit 2473f6de46
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -272,7 +272,7 @@ namespace osu.Game
};
}
Action<Visibility> stateChanged = delegate
void updateScreenOffset()
{
float offset = 0;
@ -281,11 +281,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();
Cursor.State = Visibility.Hidden;
}