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

Make IOsuScreen.AllowTrackAdjustments nullable

Browse Source 
Allows for inheriting value from the previous screen if undefined
This commit is contained in:
AbstractQbit
2021-09-14 17:37:57 +03:00
parent 52b1539dea
commit b9193aae6d
13 changed files with 42 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Screens/Edit/Editor.cs
View File

@ -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;

3
osu.Game/Screens/IOsuScreen.cs
View File

@ -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"/>.

2
osu.Game/Screens/Import/FileImportScreen.cs
View File

@ -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;

2
osu.Game/Screens/Menu/MainMenu.cs
View File

@ -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;

2
osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
View File

@ -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.

2
osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
View File

@ -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;

2
osu.Game/Screens/OnlinePlay/OnlinePlaySubScreen.cs
View File

@ -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)]

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

@ -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; }

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

@ -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);

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

@ -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));
}
}

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

@ -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;
}