Fix test failures in PerformFromScreen tests

This commit is contained in:
Dean Herbert 2021-02-15 17:14:41 +09:00
parent dffccef1f0
commit de52b8a5ba
2 changed files with 9 additions and 3 deletions

View File

@ -176,6 +176,7 @@ namespace osu.Game.Overlays.Volume
} }
} }
}; };
Bindable.ValueChanged += volume => Bindable.ValueChanged += volume =>
{ {
this.TransformTo("DisplayVolume", this.TransformTo("DisplayVolume",
@ -183,6 +184,7 @@ namespace osu.Game.Overlays.Volume
400, 400,
Easing.OutQuint); Easing.OutQuint);
}; };
bgProgress.Current.Value = 0.75f; bgProgress.Current.Value = 0.75f;
} }

View File

@ -68,15 +68,19 @@ namespace osu.Game.Screens
public override bool OnExiting(IScreen next) public override bool OnExiting(IScreen next)
{ {
this.FadeOut(transition_length, Easing.OutExpo); if (IsLoaded)
this.MoveToX(x_movement_amount, transition_length, Easing.OutExpo); {
this.FadeOut(transition_length, Easing.OutExpo);
this.MoveToX(x_movement_amount, transition_length, Easing.OutExpo);
}
return base.OnExiting(next); return base.OnExiting(next);
} }
public override void OnResuming(IScreen last) public override void OnResuming(IScreen last)
{ {
this.MoveToX(0, transition_length, Easing.OutExpo); if (IsLoaded)
this.MoveToX(0, transition_length, Easing.OutExpo);
base.OnResuming(last); base.OnResuming(last);
} }
} }