Merge branch 'master' into mod-select-performance

This commit is contained in:
Thomas Müller
2017-03-04 07:35:40 +01:00
committed by GitHub
2 changed files with 5 additions and 13 deletions

View File

@ -126,19 +126,13 @@ namespace osu.Game.Overlays
RelativeSizeAxes = Axes.Both,
Anchor = Anchor.BottomCentre,
Origin = Anchor.BottomCentre,
Children = new Drawable[]
{
new Box
{
RelativeSizeAxes = Axes.Both,
Colour = Color4.White.Opacity(50),
},
},
});
}
protected override void PopIn()
{
base.PopIn();
foreach (var w in wavesContainer.Children)
w.State = Visibility.Visible;
@ -148,6 +142,8 @@ namespace osu.Game.Overlays
protected override void PopOut()
{
base.PopOut();
contentContainer.FadeOut(DISAPPEAR_DURATION, EasingTypes.In);
contentContainer.MoveToY(DrawHeight * 2f, DISAPPEAR_DURATION, EasingTypes.In);