h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-22 12:32:55 +08:00
Code Issues Releases Wiki Activity

Rename setting to TouchDisableGameplayTaps for better visibility when searching

Browse Source
This commit is contained in:
Susko3 2023-11-07 00:13:46 +01:00
parent a4ac50cf86
commit 05d9418718
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game.Rulesets.Osu.Tests/TestSceneOsuTouchInput.cs
View File

@ -471,7 +471,7 @@ namespace osu.Game.Rulesets.Osu.Tests
[Test] [Test]
public void TestInputWhileMouseButtonsDisabled() public void TestInputWhileMouseButtonsDisabled()
{ {
AddStep("Disable gameplay taps", () => config.SetValue(OsuSetting.GameplayDisableTaps, true)); AddStep("Disable gameplay taps", () => config.SetValue(OsuSetting.TouchDisableGameplayTaps, true));
beginTouch(TouchSource.Touch1); beginTouch(TouchSource.Touch1);
@ -623,7 +623,7 @@ namespace osu.Game.Rulesets.Osu.Tests
AddStep("Release all touches", () => AddStep("Release all touches", () =>
{ {
config.SetValue(OsuSetting.MouseDisableButtons, false); config.SetValue(OsuSetting.MouseDisableButtons, false);
config.SetValue(OsuSetting.GameplayDisableTaps, false); config.SetValue(OsuSetting.TouchDisableGameplayTaps, false);
foreach (TouchSource source in InputManager.CurrentState.Touch.ActiveSources) foreach (TouchSource source in InputManager.CurrentState.Touch.ActiveSources)
InputManager.EndTouch(new Touch(source, osuInputManager.ScreenSpaceDrawQuad.Centre)); InputManager.EndTouch(new Touch(source, osuInputManager.ScreenSpaceDrawQuad.Centre));
}); });

2
osu.Game.Rulesets.Osu/UI/OsuTouchInputMapper.cs
View File

@ -43,7 +43,7 @@ namespace osu.Game.Rulesets.Osu.UI
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuConfigManager config) private void load(OsuConfigManager config)
{ {
tapsDisabled = config.GetBindable<bool>(OsuSetting.GameplayDisableTaps); tapsDisabled = config.GetBindable<bool>(OsuSetting.TouchDisableGameplayTaps);
} }
// Required to handle touches outside of the playfield when screen scaling is enabled. // Required to handle touches outside of the playfield when screen scaling is enabled.

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

@ -108,7 +108,7 @@ namespace osu.Game.Configuration
SetDefault(OsuSetting.MouseDisableWheel, false); SetDefault(OsuSetting.MouseDisableWheel, false);
SetDefault(OsuSetting.ConfineMouseMode, OsuConfineMouseMode.DuringGameplay); SetDefault(OsuSetting.ConfineMouseMode, OsuConfineMouseMode.DuringGameplay);
SetDefault(OsuSetting.GameplayDisableTaps, false); SetDefault(OsuSetting.TouchDisableGameplayTaps, false);
// Graphics // Graphics
SetDefault(OsuSetting.ShowFpsDisplay, false); SetDefault(OsuSetting.ShowFpsDisplay, false);
@ -415,6 +415,6 @@ namespace osu.Game.Configuration
ReplaySettingsOverlay, ReplaySettingsOverlay,
AutomaticallyDownloadMissingBeatmaps, AutomaticallyDownloadMissingBeatmaps,
EditorShowSpeedChanges, EditorShowSpeedChanges,
GameplayDisableTaps, TouchDisableGameplayTaps,
} }
} }

2
osu.Game/Overlays/Settings/Sections/Input/TouchSettings.cs
View File

@ -41,7 +41,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
Add(new SettingsCheckbox Add(new SettingsCheckbox
{ {
LabelText = TouchSettingsStrings.DisableTapsDuringGameplay, LabelText = TouchSettingsStrings.DisableTapsDuringGameplay,
Current = osuConfig.GetBindable<bool>(OsuSetting.GameplayDisableTaps) Current = osuConfig.GetBindable<bool>(OsuSetting.TouchDisableGameplayTaps)
}); });
} }

2
osu.Game/Rulesets/UI/RulesetInputManager.cs
View File

@ -72,7 +72,7 @@ namespace osu.Game.Rulesets.UI
private void load(OsuConfigManager config) private void load(OsuConfigManager config)
{ {
mouseDisabled = config.GetBindable<bool>(OsuSetting.MouseDisableButtons); mouseDisabled = config.GetBindable<bool>(OsuSetting.MouseDisableButtons);
tapsDisabled = config.GetBindable<bool>(OsuSetting.GameplayDisableTaps); tapsDisabled = config.GetBindable<bool>(OsuSetting.TouchDisableGameplayTaps);
} }
#region Action mapping (for replays) #region Action mapping (for replays)

2
osu.Game/Screens/Play/PlayerSettings/InputSettings.cs
View File

@ -27,6 +27,6 @@ namespace osu.Game.Screens.Play.PlayerSettings
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuConfigManager config) => mouseButtonsCheckbox.Current = config.GetBindable<bool>(RuntimeInfo.IsDesktop ? OsuSetting.MouseDisableButtons : OsuSetting.GameplayDisableTaps); private void load(OsuConfigManager config) => mouseButtonsCheckbox.Current = config.GetBindable<bool>(RuntimeInfo.IsDesktop ? OsuSetting.MouseDisableButtons : OsuSetting.DisableTapsDuringGameplay);
} }
} }