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

Enable windows key when a replay is loaded.

Browse Source
This commit is contained in:
Lucas A
2020-07-16 15:03:25 +02:00
parent 939441ae40
commit 396ada7f39
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -181,7 +181,7 @@ namespace osu.Game.Screens.Play
InternalChild = GameplayClockContainer = new GameplayClockContainer(Beatmap.Value, Mods.Value, DrawableRuleset.GameplayStartTime); InternalChild = GameplayClockContainer = new GameplayClockContainer(Beatmap.Value, Mods.Value, DrawableRuleset.GameplayStartTime);
AddInternal(gameplayBeatmap = new GameplayBeatmap(playableBeatmap)); AddInternal(gameplayBeatmap = new GameplayBeatmap(playableBeatmap));
AddInternal(screenSuspension = new ScreenSuspensionHandler(GameplayClockContainer)); AddInternal(screenSuspension = new ScreenSuspensionHandler(GameplayClockContainer, DrawableRuleset.HasReplayLoaded));
dependencies.CacheAs(gameplayBeatmap); dependencies.CacheAs(gameplayBeatmap);

8
osu.Game/Screens/Play/ScreenSuspensionHandler.cs
View File

@ -19,6 +19,7 @@ namespace osu.Game.Screens.Play
{ {
private readonly GameplayClockContainer gameplayClockContainer; private readonly GameplayClockContainer gameplayClockContainer;
private Bindable<bool> isPaused; private Bindable<bool> isPaused;
private readonly Bindable<bool> hasReplayLoaded;
[Resolved] [Resolved]
private GameHost host { get; set; } private GameHost host { get; set; }
@ -26,9 +27,10 @@ namespace osu.Game.Screens.Play
[Resolved] [Resolved]
private SessionStatics statics { get; set; } private SessionStatics statics { get; set; }
public ScreenSuspensionHandler([NotNull] GameplayClockContainer gameplayClockContainer) public ScreenSuspensionHandler([NotNull] GameplayClockContainer gameplayClockContainer, Bindable<bool> hasReplayLoaded)
{ {
this.gameplayClockContainer = gameplayClockContainer ?? throw new ArgumentNullException(nameof(gameplayClockContainer)); this.gameplayClockContainer = gameplayClockContainer ?? throw new ArgumentNullException(nameof(gameplayClockContainer));
this.hasReplayLoaded = hasReplayLoaded.GetBoundCopy();
} }
protected override void LoadComplete() protected override void LoadComplete()
@ -43,8 +45,9 @@ namespace osu.Game.Screens.Play
isPaused.BindValueChanged(paused => isPaused.BindValueChanged(paused =>
{ {
host.AllowScreenSuspension.Value = paused.NewValue; host.AllowScreenSuspension.Value = paused.NewValue;
statics.Set(Static.DisableWindowsKey, !paused.NewValue); statics.Set(Static.DisableWindowsKey, !paused.NewValue && !hasReplayLoaded.Value);
}, true); }, true);
hasReplayLoaded.BindValueChanged(_ => isPaused.TriggerChange(), true);
} }
protected override void Dispose(bool isDisposing) protected override void Dispose(bool isDisposing)
@ -52,6 +55,7 @@ namespace osu.Game.Screens.Play
base.Dispose(isDisposing); base.Dispose(isDisposing);
isPaused?.UnbindAll(); isPaused?.UnbindAll();
hasReplayLoaded.UnbindAll();
if (host != null) if (host != null)
{ {