h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-22 00:33:22 +08:00
Code Issues Releases Wiki Activity

Cast base immutable bindable to mutable for testing purposes and make InitialOverlayActivationMode property protected

Browse Source
This commit is contained in:
Lucas A 2020-08-31 11:16:13 +02:00
parent 03b7c8b889
commit dd093f44d8
4 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
osu.Game.Tests/Visual/Menus/TestSceneToolbar.cs
View File

@ -91,12 +91,7 @@ namespace osu.Game.Tests.Visual.Menus
public class TestToolbar : Toolbar public class TestToolbar : Toolbar
{ {
public TestToolbar() public new Bindable<OverlayActivation> OverlayActivationMode => base.OverlayActivationMode as Bindable<OverlayActivation>;
{
base.OverlayActivationMode.BindTo(OverlayActivationMode);
}
public new Bindable<OverlayActivation> OverlayActivationMode { get; } = new Bindable<OverlayActivation>(OverlayActivation.All);
} }
} }
} }

2
osu.Game/Screens/OsuScreen.cs
View File

@ -46,7 +46,7 @@ namespace osu.Game.Screens
/// <summary> /// <summary>
/// The initial initial overlay activation mode to use when this screen is entered for the first time. /// The initial initial overlay activation mode to use when this screen is entered for the first time.
/// </summary> /// </summary>
public virtual OverlayActivation InitialOverlayActivationMode => OverlayActivation.All; protected virtual OverlayActivation InitialOverlayActivationMode => OverlayActivation.All;
public Bindable<OverlayActivation> OverlayActivationMode { get; } public Bindable<OverlayActivation> OverlayActivationMode { get; }

2
osu.Game/Screens/Play/Player.cs
View File

@ -50,7 +50,7 @@ namespace osu.Game.Screens.Play
public override bool HideOverlaysOnEnter => true; public override bool HideOverlaysOnEnter => true;
public override OverlayActivation InitialOverlayActivationMode => OverlayActivation.UserTriggered; protected override OverlayActivation InitialOverlayActivationMode => OverlayActivation.UserTriggered;
/// <summary> /// <summary>
/// Whether gameplay should pause when the game window focus is lost. /// Whether gameplay should pause when the game window focus is lost.

2
osu.Game/Screens/StartupScreen.cs
View File

@ -18,6 +18,6 @@ namespace osu.Game.Screens
public override bool AllowRateAdjustments => false; public override bool AllowRateAdjustments => false;
public override OverlayActivation InitialOverlayActivationMode => OverlayActivation.Disabled; protected override OverlayActivation InitialOverlayActivationMode => OverlayActivation.Disabled;
} }
} }