From dd093f44d8826af623ed5232e6a38d8f39b0ce20 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Mon, 31 Aug 2020 11:16:13 +0200
Subject: [PATCH] Cast base immutable bindable to mutable for testing purposes
 and make InitialOverlayActivationMode property protected

---
 osu.Game.Tests/Visual/Menus/TestSceneToolbar.cs | 7 +------
 osu.Game/Screens/OsuScreen.cs                   | 2 +-
 osu.Game/Screens/Play/Player.cs                 | 2 +-
 osu.Game/Screens/StartupScreen.cs               | 2 +-
 4 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Tests/Visual/Menus/TestSceneToolbar.cs b/osu.Game.Tests/Visual/Menus/TestSceneToolbar.cs
index 841860accb..2a4486812c 100644
--- a/osu.Game.Tests/Visual/Menus/TestSceneToolbar.cs
+++ b/osu.Game.Tests/Visual/Menus/TestSceneToolbar.cs
@@ -91,12 +91,7 @@ namespace osu.Game.Tests.Visual.Menus
 
         public class TestToolbar : Toolbar
         {
-            public TestToolbar()
-            {
-                base.OverlayActivationMode.BindTo(OverlayActivationMode);
-            }
-
-            public new Bindable<OverlayActivation> OverlayActivationMode { get; } = new Bindable<OverlayActivation>(OverlayActivation.All);
+            public new Bindable<OverlayActivation> OverlayActivationMode => base.OverlayActivationMode as Bindable<OverlayActivation>;
         }
     }
 }
diff --git a/osu.Game/Screens/OsuScreen.cs b/osu.Game/Screens/OsuScreen.cs
index c687c34ce9..c10deaf1e5 100644
--- a/osu.Game/Screens/OsuScreen.cs
+++ b/osu.Game/Screens/OsuScreen.cs
@@ -46,7 +46,7 @@ namespace osu.Game.Screens
         /// <summary>
         /// The initial initial overlay activation mode to use when this screen is entered for the first time.
         /// </summary>
-        public virtual OverlayActivation InitialOverlayActivationMode => OverlayActivation.All;
+        protected virtual OverlayActivation InitialOverlayActivationMode => OverlayActivation.All;
 
         public Bindable<OverlayActivation> OverlayActivationMode { get; }
 
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 541275cf55..0a5158c6dc 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Screens.Play
 
         public override bool HideOverlaysOnEnter => true;
 
-        public override OverlayActivation InitialOverlayActivationMode => OverlayActivation.UserTriggered;
+        protected override OverlayActivation InitialOverlayActivationMode => OverlayActivation.UserTriggered;
 
         /// <summary>
         /// Whether gameplay should pause when the game window focus is lost.
diff --git a/osu.Game/Screens/StartupScreen.cs b/osu.Game/Screens/StartupScreen.cs
index c3e36c8e9d..e5e134fd39 100644
--- a/osu.Game/Screens/StartupScreen.cs
+++ b/osu.Game/Screens/StartupScreen.cs
@@ -18,6 +18,6 @@ namespace osu.Game.Screens
 
         public override bool AllowRateAdjustments => false;
 
-        public override OverlayActivation InitialOverlayActivationMode => OverlayActivation.Disabled;
+        protected override OverlayActivation InitialOverlayActivationMode => OverlayActivation.Disabled;
     }
 }