sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-04 15:16:38 +09:00
Code Issues Packages Projects Releases Wiki Activity

Move MusicController adjustment set to inside OsuScreen itself (and result nullable)

Browse Source
This commit is contained in:
Dean Herbert
2021-09-16 16:08:09 +09:00
parent 9057be1a02
commit fa693bb8a8
9 changed files with 23 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
osu.Game.Tests/Visual/TestSceneOsuScreenStack.cs
View File

@ -25,8 +25,6 @@ namespace osu.Game.Tests.Visual
private void load()
{
stack = new TestOsuScreenStack { RelativeSizeAxes = Axes.Both };
stack.ScreenPushed += screenChanged;
stack.ScreenExited += screenChanged;
Add(musicController);
Add(stack);
@ -129,12 +127,12 @@ namespace osu.Game.Tests.Visual
private class AllowScreen : OsuScreen
{
public override bool AllowTrackAdjustments => true;
public override bool? AllowTrackAdjustments => true;
}
public class DisallowScreen : OsuScreen
{
public override bool AllowTrackAdjustments => false;
public override bool? AllowTrackAdjustments => false;
}
private class InheritScreen : OsuScreen
@ -147,11 +145,5 @@ namespace osu.Game.Tests.Visual
LoadComponent(screen);
return screen;
}
private void screenChanged(IScreen current, IScreen newScreen)
{
if (newScreen is IOsuScreen newOsuScreen)
musicController.AllowTrackAdjustments = newOsuScreen.AllowTrackAdjustments;
}
}
}