Merge remote-tracking branch 'upstream/master' into back-button-part-2

This commit is contained in:
David Zhao
2019-08-13 12:26:12 +09:00
140 changed files with 3470 additions and 1099 deletions

View File

@ -24,8 +24,8 @@ namespace osu.Game.Graphics.UserInterface
Child = button = new TwoLayerButton
{
Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft,
Anchor = Anchor.TopLeft,
Origin = Anchor.TopLeft,
Text = @"back",
Icon = OsuIcon.LeftCircle,
Action = () => Action?.Invoke()