diff --git a/osu.Android.props b/osu.Android.props
index ff76e17184..c73c643d4b 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -11,7 +11,7 @@
manifestmerger.jar
-
+
diff --git a/osu.Game/Input/OsuUserInputManager.cs b/osu.Game/Input/OsuUserInputManager.cs
index ab43497156..c205636ab9 100644
--- a/osu.Game/Input/OsuUserInputManager.cs
+++ b/osu.Game/Input/OsuUserInputManager.cs
@@ -3,6 +3,7 @@
#nullable disable
+using osu.Framework.Bindables;
using osu.Framework.Input;
using osuTK.Input;
@@ -10,6 +11,10 @@ namespace osu.Game.Input
{
public partial class OsuUserInputManager : UserInputManager
{
+ protected override bool AllowRightClickFromLongTouch => !LocalUserPlaying.Value;
+
+ public readonly BindableBool LocalUserPlaying = new BindableBool();
+
internal OsuUserInputManager()
{
}
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 7c9b03bd5b..fe6e479d19 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -269,6 +269,13 @@ namespace osu.Game
if (hideToolbar) Toolbar.Hide();
}
+ protected override UserInputManager CreateUserInputManager()
+ {
+ var userInputManager = base.CreateUserInputManager();
+ (userInputManager as OsuUserInputManager)?.LocalUserPlaying.BindTo(LocalUserPlaying);
+ return userInputManager;
+ }
+
private DependencyContainer dependencies;
protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent) =>
diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
index 951cf3802f..4c9320c2a6 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
@@ -3,6 +3,8 @@
#nullable disable
+using System.Collections.Generic;
+using System.Linq;
using osu.Framework;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
@@ -23,6 +25,8 @@ namespace osu.Game.Overlays.Settings.Sections.Input
{
public partial class TabletSettings : SettingsSubsection
{
+ public override IEnumerable FilterTerms => base.FilterTerms.Concat(new LocalisableString[] { "area" });
+
public TabletAreaSelection AreaSelection { get; private set; }
private readonly ITabletHandler tabletHandler;
diff --git a/osu.Game/Rulesets/UI/RulesetInputManager.cs b/osu.Game/Rulesets/UI/RulesetInputManager.cs
index 2ae54a3afe..a24e22f22b 100644
--- a/osu.Game/Rulesets/UI/RulesetInputManager.cs
+++ b/osu.Game/Rulesets/UI/RulesetInputManager.cs
@@ -28,6 +28,8 @@ namespace osu.Game.Rulesets.UI
public abstract partial class RulesetInputManager : PassThroughInputManager, ICanAttachHUDPieces, IHasReplayHandler, IHasRecordingHandler
where T : struct
{
+ protected override bool AllowRightClickFromLongTouch => false;
+
public readonly KeyBindingContainer KeyBindingContainer;
[Resolved(CanBeNull = true)]
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 4315f44e07..3ea4a57c2c 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -36,7 +36,7 @@
runtime; build; native; contentfiles; analyzers; buildtransitive
-
+
diff --git a/osu.iOS.props b/osu.iOS.props
index c5477f765e..a240dec963 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -16,6 +16,6 @@
iossimulator-x64
-
+