sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-17 11:37:32 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11784 from peppy/fix-perform-from-screen-test-failures

Browse Source 
Fix test failures in PerformFromScreen tests
This commit is contained in:
Dan Balasescu 2021-02-15 19:32:01 +09:00 committed by GitHub
commit eae8bc7f79
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Overlays/Volume/VolumeMeter.cs
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;
} }

4
osu.Game/Screens/BackgroundScreen.cs
View File

@ -67,15 +67,19 @@ namespace osu.Game.Screens
} }
public override bool OnExiting(IScreen next) public override bool OnExiting(IScreen next)
{
if (IsLoaded)
{ {
this.FadeOut(transition_length, Easing.OutExpo); this.FadeOut(transition_length, Easing.OutExpo);
this.MoveToX(x_movement_amount, 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)
{ {
if (IsLoaded)
this.MoveToX(0, transition_length, Easing.OutExpo); this.MoveToX(0, transition_length, Easing.OutExpo);
base.OnResuming(last); base.OnResuming(last);
} }