Make IOsuScreen.AllowTrackAdjustments nullable

Allows for inheriting value from the previous screen if undefined

osu.Game/OsuGame.cs

@@ -1075,8 +1075,6 @@ namespace osu.Game
                 OverlayActivationMode.BindTo(newOsuScreen.OverlayActivationMode);
                 API.Activity.BindTo(newOsuScreen.Activity);
 
-                MusicController.AllowTrackAdjustments = newOsuScreen.AllowTrackAdjustments;
-
                 if (newOsuScreen.HideOverlaysOnEnter)
                     CloseAllOverlays();
                 else
@@ -1093,6 +1091,24 @@ namespace osu.Game
         {
             ScreenChanged(lastScreen, newScreen);
             Logger.Log($"Screen changed → {newScreen}");
+
+            // set AllowTrackAdjustments if new screen defines it, inherit otherwise
+            if (newScreen is IOsuScreen newOsuScreen && newOsuScreen.AllowTrackAdjustments.HasValue)
+            {
+                allowTrackAdjustmentsStack.Push(newOsuScreen.AllowTrackAdjustments.Value);
+                Logger.Log($"Screen's AllowTrackAdjustments explicit → {allowTrackAdjustmentsStack.First()}");
+            }
+            else if (allowTrackAdjustmentsStack.Any())
+            {
+                allowTrackAdjustmentsStack.Push(allowTrackAdjustmentsStack.First());
+                Logger.Log($"Screen's AllowTrackAdjustments inherit → {allowTrackAdjustmentsStack.First()}");
+            }
+            else
+            {
+                allowTrackAdjustmentsStack.Push(false);
+            }
+
+            MusicController.AllowTrackAdjustments = allowTrackAdjustmentsStack.First();
         }
 
         private void screenExited(IScreen lastScreen, IScreen newScreen)
@@ -1102,8 +1118,17 @@ namespace osu.Game
 
             if (newScreen == null)
                 Exit();
+
+            if (allowTrackAdjustmentsStack.Count > 1)
+            {
+                allowTrackAdjustmentsStack.Pop();
+                MusicController.AllowTrackAdjustments = allowTrackAdjustmentsStack.First();
+                Logger.Log($"Screen's AllowTrackAdjustments return ← {allowTrackAdjustmentsStack.First()}");
+            }
         }
 
+        private Stack<bool> allowTrackAdjustmentsStack = new Stack<bool>();
+
         IBindable<bool> ILocalUserPlayInfo.IsPlaying => LocalUserPlaying;
     }
 }

osu.Game/Overlays/Settings/Sections/Maintenance/DirectorySelectScreen.cs

@@ -24,7 +24,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
 
         private OsuDirectorySelector directorySelector;
 
-        public override bool AllowTrackAdjustments => false;
+        public override bool? AllowTrackAdjustments => false;
 
         /// <summary>
         /// Text to display in the header to inform the user of what they are selecting.

osu.Game/Screens/Edit/Editor.cs

@@ -56,7 +56,7 @@ namespace osu.Game.Screens.Edit
 
         public override bool DisallowExternalBeatmapRulesetChanges => true;
 
-        public override bool AllowTrackAdjustments => false;
+        public override bool? AllowTrackAdjustments => false;
 
         protected bool HasUnsavedChanges => lastSavedHash != changeHandler.CurrentStateHash;
 

osu.Game/Screens/IOsuScreen.cs

@@ -60,8 +60,9 @@ namespace osu.Game.Screens
 
         /// <summary>
         /// Whether mod track adjustments are allowed to be applied.
+        /// Null means to inherit from the parent screen.
         /// </summary>
-        bool AllowTrackAdjustments { get; }
+        bool? AllowTrackAdjustments { get; }
 
         /// <summary>
         /// Invoked when the back button has been pressed to close any overlays before exiting this <see cref="IOsuScreen"/>.

osu.Game/Screens/Import/FileImportScreen.cs

@@ -23,7 +23,7 @@ namespace osu.Game.Screens.Import
     {
         public override bool HideOverlaysOnEnter => true;
 
-        public override bool AllowTrackAdjustments => false;
+        public override bool? AllowTrackAdjustments => false;
 
         private OsuFileSelector fileSelector;
         private Container contentContainer;

osu.Game/Screens/Menu/MainMenu.cs

@@ -36,7 +36,7 @@ namespace osu.Game.Screens.Menu
 
         public override bool AllowExternalScreenChange => true;
 
-        public override bool AllowTrackAdjustments => false;
+        public override bool? AllowTrackAdjustments => false;
 
         private Screen songSelect;
 

osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs

@@ -26,7 +26,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         public override bool DisallowExternalBeatmapRulesetChanges => true;
 
         // We are managing our own adjustments. For now, this happens inside the Player instances themselves.
-        public override bool AllowTrackAdjustments => false;
+        public override bool? AllowTrackAdjustments => false;
 
         /// <summary>
         /// Whether all spectating players have finished loading.

osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs

@@ -24,7 +24,7 @@ namespace osu.Game.Screens.OnlinePlay
         [Cached]
         protected readonly OverlayColourProvider ColourProvider = new OverlayColourProvider(OverlayColourScheme.Plum);
 
-        public override bool AllowTrackAdjustments => false;
+        public override bool? AllowTrackAdjustments => false;
 
         public override bool CursorVisible => (screenStack?.CurrentScreen as IOnlinePlaySubScreen)?.CursorVisible ?? true;
 

osu.Game/Screens/OnlinePlay/OnlinePlaySubScreen.cs

@@ -11,6 +11,8 @@ namespace osu.Game.Screens.OnlinePlay
     {
         public override bool DisallowExternalBeatmapRulesetChanges => false;
 
+        public override bool? AllowTrackAdjustments => true;
+
         public virtual string ShortTitle => Title;
 
         [Resolved(CanBeNull = true)]

osu.Game/Screens/OsuScreen.cs

@@ -81,7 +81,7 @@ namespace osu.Game.Screens
 
         public virtual float BackgroundParallaxAmount => 1;
 
-        public virtual bool AllowTrackAdjustments => true;
+        public virtual bool? AllowTrackAdjustments => null;
 
         public Bindable<WorkingBeatmap> Beatmap { get; private set; }
 

osu.Game/Screens/Play/Player.cs

@@ -56,7 +56,7 @@ namespace osu.Game.Screens.Play
         protected override OverlayActivation InitialOverlayActivationMode => OverlayActivation.UserTriggered;
 
         // We are managing our own adjustments (see OnEntering/OnExiting).
-        public override bool AllowTrackAdjustments => false;
+        public override bool? AllowTrackAdjustments => false;
 
         private readonly IBindable<bool> gameActive = new Bindable<bool>(true);
 

osu.Game/Screens/Play/ScreenWithBeatmapBackground.cs

@@ -10,6 +10,8 @@ namespace osu.Game.Screens.Play
     {
         protected override BackgroundScreen CreateBackground() => new BackgroundScreenBeatmap(Beatmap.Value);
 
+        public override bool? AllowTrackAdjustments => true;
+
         public void ApplyToBackground(Action<BackgroundScreenBeatmap> action) => base.ApplyToBackground(b => action.Invoke((BackgroundScreenBeatmap)b));
     }
 }

osu.Game/Screens/StartupScreen.cs

@@ -16,7 +16,7 @@ namespace osu.Game.Screens
 
         public override bool CursorVisible => false;
 
-        public override bool AllowTrackAdjustments => false;
+        public override bool? AllowTrackAdjustments => false;
 
         protected override OverlayActivation InitialOverlayActivationMode => OverlayActivation.Disabled;
     }