h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-14 15:57:24 +08:00
Code Issues Releases Wiki Activity

Remove mobile specific changes

Browse Source 
Will be added back in a separate PR
This commit is contained in:
Susko3 2023-11-07 13:06:14 +01:00
parent 7385c3c97b
commit fcd73e62d2
3 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Android/OsuGameAndroid.cs
View File

@ -98,9 +98,6 @@ namespace osu.Android
case AndroidJoystickHandler jh: case AndroidJoystickHandler jh:
return new AndroidJoystickSettings(jh); return new AndroidJoystickSettings(jh);
case AndroidTouchHandler:
return new TouchSettings(handler);
default: default:
return base.CreateSettingsSubsectionFor(handler); return base.CreateSettingsSubsectionFor(handler);
} }

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

@ -29,14 +29,11 @@ namespace osu.Game.Overlays.Settings.Sections.Input
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuConfigManager osuConfig) private void load(OsuConfigManager osuConfig)
{ {
if (!RuntimeInfo.IsMobile) // don't allow disabling the only input method (touch) on mobile. Add(new SettingsCheckbox
{ {
Add(new SettingsCheckbox LabelText = CommonStrings.Enabled,
{ Current = handler.Enabled
LabelText = CommonStrings.Enabled, });
Current = handler.Enabled
});
}
Add(new SettingsCheckbox Add(new SettingsCheckbox
{ {

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

@ -23,9 +23,8 @@ namespace osu.Game.Screens.Play.PlayerSettings
{ {
new PlayerCheckbox new PlayerCheckbox
{ {
// TODO: change to touchscreen detection once https://github.com/ppy/osu/pull/25348 makes it in LabelText = MouseSettingsStrings.DisableClicksDuringGameplay,
LabelText = RuntimeInfo.IsDesktop ? MouseSettingsStrings.DisableClicksDuringGameplay : TouchSettingsStrings.DisableTapsDuringGameplay, Current = config.GetBindable<bool>(OsuSetting.MouseDisableButtons)
Current = config.GetBindable<bool>(RuntimeInfo.IsDesktop ? OsuSetting.MouseDisableButtons : OsuSetting.TouchDisableGameplayTaps)
} }
}; };
} }