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

Refactor overlay activation logic and reword tip.

Browse Source
This commit is contained in:
Lucas A
2020-08-05 11:21:09 +02:00
parent 30c7a6f6a7
commit 71895964f4
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -190,7 +190,7 @@ namespace osu.Game.Screens.Menu
{ {
"You can press Ctrl-T anywhere in the game to toggle the toolbar!", "You can press Ctrl-T anywhere in the game to toggle the toolbar!",
"You can press Ctrl-O anywhere in the game to access options!", "You can press Ctrl-O anywhere in the game to access options!",
"All settings are dynamic and take effect in real-time. Try changing the skin while playing!", "All settings are dynamic and take effect in real-time. Try pausing and changing the skin while playing!",
"New features are coming online every update. Make sure to stay up-to-date!", "New features are coming online every update. Make sure to stay up-to-date!",
"If you find the UI too large or small, try adjusting UI scale in settings!", "If you find the UI too large or small, try adjusting UI scale in settings!",
"Try adjusting the \"Screen Scaling\" mode to change your gameplay or UI area, even in fullscreen!", "Try adjusting the \"Screen Scaling\" mode to change your gameplay or UI area, even in fullscreen!",

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

@ -361,10 +361,12 @@ namespace osu.Game.Screens.Play
private void updateOverlayActivationMode() private void updateOverlayActivationMode()
{ {
if (DrawableRuleset.HasReplayLoaded.Value) bool canTriggerOverlays = DrawableRuleset.IsPaused.Value || !gameplayOverlaysDisabled.Value;
if (DrawableRuleset.HasReplayLoaded.Value || canTriggerOverlays)
OverlayActivationMode.Value = OverlayActivation.UserTriggered; OverlayActivationMode.Value = OverlayActivation.UserTriggered;
else else
OverlayActivationMode.Value = gameplayOverlaysDisabled.Value && !DrawableRuleset.IsPaused.Value ? OverlayActivation.Disabled : OverlayActivation.UserTriggered; OverlayActivationMode.Value = OverlayActivation.Disabled;
} }
private void updatePauseOnFocusLostState() => private void updatePauseOnFocusLostState() =>