RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2024-12-24 15:53:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename DuringGameplay

Browse Source
This commit is contained in:
Shane Woolcock 2020-10-06 19:52:18 +10:30
parent d5782c95bd
commit 1877312a91
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Configuration/OsuConfigManager.cs
View File

@ -70,7 +70,7 @@ namespace osu.Game.Configuration
Set(OsuSetting.MouseDisableButtons, false); Set(OsuSetting.MouseDisableButtons, false);
Set(OsuSetting.MouseDisableWheel, false); Set(OsuSetting.MouseDisableWheel, false);
Set(OsuSetting.ConfineMouseMode, OsuConfineMouseMode.DuringGameplay); Set(OsuSetting.ConfineMouseMode, OsuConfineMouseMode.WhenOverlaysDisabled);
// Graphics // Graphics
Set(OsuSetting.ShowFpsDisplay, false); Set(OsuSetting.ShowFpsDisplay, false);

4
osu.Game/Input/ConfineMouseTracker.cs
View File

@ -16,7 +16,7 @@ namespace osu.Game.Input
/// Connects <see cref="OsuSetting.ConfineMouseMode"/> with <see cref="FrameworkSetting.ConfineMouseMode"/>, /// Connects <see cref="OsuSetting.ConfineMouseMode"/> with <see cref="FrameworkSetting.ConfineMouseMode"/>,
/// while optionally binding an <see cref="OverlayActivation"/> mode, usually that of the current <see cref="Player"/>. /// while optionally binding an <see cref="OverlayActivation"/> mode, usually that of the current <see cref="Player"/>.
/// It is assumed that while overlay activation is <see cref="OverlayActivation.Disabled"/>, we should also confine the /// It is assumed that while overlay activation is <see cref="OverlayActivation.Disabled"/>, we should also confine the
/// mouse cursor if it has been requested with <see cref="OsuConfineMouseMode.DuringGameplay"/>. /// mouse cursor if it has been requested with <see cref="OsuConfineMouseMode.WhenOverlaysDisabled"/>.
/// </summary> /// </summary>
public class ConfineMouseTracker : Component public class ConfineMouseTracker : Component
{ {
@ -52,7 +52,7 @@ namespace osu.Game.Input
frameworkConfineMode.Value = ConfineMouseMode.Fullscreen; frameworkConfineMode.Value = ConfineMouseMode.Fullscreen;
break; break;
case OsuConfineMouseMode.DuringGameplay: case OsuConfineMouseMode.WhenOverlaysDisabled:
frameworkConfineMode.Value = OverlayActivationMode.Value == OverlayActivation.Disabled ? ConfineMouseMode.Always : ConfineMouseMode.Never; frameworkConfineMode.Value = OverlayActivationMode.Value == OverlayActivation.Disabled ? ConfineMouseMode.Always : ConfineMouseMode.Never;
break; break;

2
osu.Game/Input/OsuConfineMouseMode.cs
View File

@ -27,7 +27,7 @@ namespace osu.Game.Input
/// but may otherwise move freely. /// but may otherwise move freely.
/// </summary> /// </summary>
[Description("During Gameplay")] [Description("During Gameplay")]
DuringGameplay, WhenOverlaysDisabled,
/// <summary> /// <summary>
/// The mouse cursor will always be locked to the window bounds while the game has focus. /// The mouse cursor will always be locked to the window bounds while the game has focus.