1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 16:27:26 +08:00

Merge pull request #1479 from peppy/fix-toolbar-display

Fix toolbar not appearing at main menu
This commit is contained in:
Dan Balasescu 2017-11-09 21:30:43 +09:00 committed by GitHub
commit 8a8e6269ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -263,17 +263,15 @@ namespace osu.Game.Screens.Menu
logo.ScaleTo(0.5f, 200, Easing.In); logo.ScaleTo(0.5f, 200, Easing.In);
trackingPosition = false; trackingPosition = false;
logo logo
.MoveTo(iconTrackingPosition, lastState == MenuState.EnteringMode ? 0 : 200, Easing.In) .MoveTo(iconTrackingPosition, lastState == MenuState.EnteringMode ? 0 : 200, Easing.In)
.OnComplete(o => .OnComplete(o =>
{ {
trackingPosition = true; trackingPosition = true;
if (logo.Scale.X > 0.5f) o.Impact();
{ toolbar?.Show();
o.Impact();
toolbar?.Show();
}
}); });
break; break;
default: default: