From f0439ef50b0dd9217e43508217b34c0e47dcba7b Mon Sep 17 00:00:00 2001
From: AbstractQbit <38468635+AbstractQbit@users.noreply.github.com>
Date: Wed, 15 Sep 2021 13:12:57 +0300
Subject: [PATCH] Remove unnecessary `AllowTrackAdjustments` overrides, add
true to `SongSelect`
---
.../Settings/Sections/Maintenance/DirectorySelectScreen.cs | 2 --
osu.Game/Screens/Import/FileImportScreen.cs | 2 --
osu.Game/Screens/Menu/MainMenu.cs | 2 --
osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs | 2 --
osu.Game/Screens/Play/ScreenWithBeatmapBackground.cs | 2 --
osu.Game/Screens/Select/SongSelect.cs | 2 ++
osu.Game/Screens/StartupScreen.cs | 2 --
7 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/DirectorySelectScreen.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/DirectorySelectScreen.cs
index 6d0e79e2c7..e509cac2f1 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/DirectorySelectScreen.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/DirectorySelectScreen.cs
@@ -24,8 +24,6 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
private OsuDirectorySelector directorySelector;
- public override bool? AllowTrackAdjustments => false;
-
///
/// Text to display in the header to inform the user of what they are selecting.
///
diff --git a/osu.Game/Screens/Import/FileImportScreen.cs b/osu.Game/Screens/Import/FileImportScreen.cs
index 69fcf31876..7e1d55b3e2 100644
--- a/osu.Game/Screens/Import/FileImportScreen.cs
+++ b/osu.Game/Screens/Import/FileImportScreen.cs
@@ -23,8 +23,6 @@ namespace osu.Game.Screens.Import
{
public override bool HideOverlaysOnEnter => true;
- public override bool? AllowTrackAdjustments => false;
-
private OsuFileSelector fileSelector;
private Container contentContainer;
private TextFlowContainer currentFileText;
diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index 00885a91c5..221b31f855 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -36,8 +36,6 @@ namespace osu.Game.Screens.Menu
public override bool AllowExternalScreenChange => true;
- public override bool? AllowTrackAdjustments => false;
-
private Screen songSelect;
private MenuSideFlashes sideFlashes;
diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs b/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
index e3945c9cac..fc20b21b60 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
@@ -24,8 +24,6 @@ namespace osu.Game.Screens.OnlinePlay
[Cached]
protected readonly OverlayColourProvider ColourProvider = new OverlayColourProvider(OverlayColourScheme.Plum);
- public override bool? AllowTrackAdjustments => false;
-
public override bool CursorVisible => (screenStack?.CurrentScreen as IOnlinePlaySubScreen)?.CursorVisible ?? true;
// this is required due to PlayerLoader eventually being pushed to the main stack
diff --git a/osu.Game/Screens/Play/ScreenWithBeatmapBackground.cs b/osu.Game/Screens/Play/ScreenWithBeatmapBackground.cs
index 9bec320e22..88dab88d42 100644
--- a/osu.Game/Screens/Play/ScreenWithBeatmapBackground.cs
+++ b/osu.Game/Screens/Play/ScreenWithBeatmapBackground.cs
@@ -10,8 +10,6 @@ namespace osu.Game.Screens.Play
{
protected override BackgroundScreen CreateBackground() => new BackgroundScreenBeatmap(Beatmap.Value);
- public override bool? AllowTrackAdjustments => true;
-
public void ApplyToBackground(Action action) => base.ApplyToBackground(b => action.Invoke((BackgroundScreenBeatmap)b));
}
}
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index f11f9fd614..1f0f134ba7 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -53,6 +53,8 @@ namespace osu.Game.Screens.Select
protected virtual bool DisplayStableImportPrompt => stableImportManager?.SupportsImportFromStable == true;
+ public override bool? AllowTrackAdjustments => true;
+
///
/// Can be null if is false.
///
diff --git a/osu.Game/Screens/StartupScreen.cs b/osu.Game/Screens/StartupScreen.cs
index 7b73d36fdf..be217d6b1f 100644
--- a/osu.Game/Screens/StartupScreen.cs
+++ b/osu.Game/Screens/StartupScreen.cs
@@ -16,8 +16,6 @@ namespace osu.Game.Screens
public override bool CursorVisible => false;
- public override bool? AllowTrackAdjustments => false;
-
protected override OverlayActivation InitialOverlayActivationMode => OverlayActivation.Disabled;
}
}