sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-05 23:53:51 +09:00
Code Issues Packages Projects Releases Wiki Activity

Expose HoldingForHUD state from HUDOverlay as bindable

Browse Source
This commit is contained in:
Dean Herbert
2022-05-11 16:09:16 +09:00
parent 396be1bf18
commit 1c36995606
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
osu.Game/Screens/Play/HUDOverlay.cs
View File

@ -68,7 +68,9 @@ namespace osu.Game.Screens.Play
internal readonly IBindable<bool> IsPlaying = new Bindable<bool>(); internal readonly IBindable<bool> IsPlaying = new Bindable<bool>();
private bool holdingForHUD; public IBindable<bool> HoldingForHUD => holdingForHUD;
private readonly BindableBool holdingForHUD = new BindableBool();
private readonly SkinnableTargetContainer mainComponents; private readonly SkinnableTargetContainer mainComponents;
@ -144,7 +146,8 @@ namespace osu.Game.Screens.Play
hideTargets.ForEach(d => d.Hide()); hideTargets.ForEach(d => d.Hide());
} }
public override void Hide() => throw new InvalidOperationException($"{nameof(HUDOverlay)} should not be hidden as it will remove the ability of a user to quit. Use {nameof(ShowHud)} instead."); public override void Hide() =>
throw new InvalidOperationException($"{nameof(HUDOverlay)} should not be hidden as it will remove the ability of a user to quit. Use {nameof(ShowHud)} instead.");
protected override void LoadComplete() protected override void LoadComplete()
{ {
@ -152,6 +155,7 @@ namespace osu.Game.Screens.Play
ShowHud.BindValueChanged(visible => hideTargets.ForEach(d => d.FadeTo(visible.NewValue ? 1 : 0, FADE_DURATION, FADE_EASING))); ShowHud.BindValueChanged(visible => hideTargets.ForEach(d => d.FadeTo(visible.NewValue ? 1 : 0, FADE_DURATION, FADE_EASING)));
holdingForHUD.BindValueChanged(_ => updateVisibility());
IsPlaying.BindValueChanged(_ => updateVisibility()); IsPlaying.BindValueChanged(_ => updateVisibility());
configVisibilityMode.BindValueChanged(_ => updateVisibility(), true); configVisibilityMode.BindValueChanged(_ => updateVisibility(), true);
@ -204,7 +208,7 @@ namespace osu.Game.Screens.Play
if (ShowHud.Disabled) if (ShowHud.Disabled)
return; return;
if (holdingForHUD) if (holdingForHUD.Value)
{ {
ShowHud.Value = true; ShowHud.Value = true;
return; return;
@ -287,8 +291,7 @@ namespace osu.Game.Screens.Play
switch (e.Action) switch (e.Action)
{ {
case GlobalAction.HoldForHUD: case GlobalAction.HoldForHUD:
holdingForHUD = true; holdingForHUD.Value = true;
updateVisibility();
return true; return true;
case GlobalAction.ToggleInGameInterface: case GlobalAction.ToggleInGameInterface:
@ -318,8 +321,7 @@ namespace osu.Game.Screens.Play
switch (e.Action) switch (e.Action)
{ {
case GlobalAction.HoldForHUD: case GlobalAction.HoldForHUD:
holdingForHUD = false; holdingForHUD.Value = false;
updateVisibility();
break; break;
} }
} }