Merge pull request #25432 from bdach/touch-device-fixes

Fix some touch device-related issues
ppy · Nov 14, 2023 · 572ec91 · 572ec91
2 parents bb2f38d + 70d2de5
commit 572ec91
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/osu.Game/Rulesets/Mods/ModTouchDevice.cs b/osu.Game/Rulesets/Mods/ModTouchDevice.cs
@@ -16,6 +16,8 @@ public class ModTouchDevice : Mod, IApplicableMod
         public sealed override LocalisableString Description => "Automatically applied to plays on devices with a touchscreen.";
         public sealed override double ScoreMultiplier => 1;
         public sealed override ModType Type => ModType.System;
+        public sealed override bool ValidForMultiplayer => false;
+        public sealed override bool ValidForMultiplayerAsFreeMod => false;
         public sealed override bool AlwaysValidForSubmission => true;
         public override Type[] IncompatibleMods => new[] { typeof(ICreateReplayData) };
     }

diff --git a/osu.Game/Screens/Select/PlaySongSelect.cs b/osu.Game/Screens/Select/PlaySongSelect.cs
@@ -48,6 +48,8 @@ public partial class PlaySongSelect : SongSelect
         private void load(OsuColour colours)
         {
             BeatmapOptions.AddButton(ButtonSystemStrings.Edit.ToSentence(), @"beatmap", FontAwesome.Solid.PencilAlt, colours.Yellow, () => Edit());
+
+            AddInternal(new SongSelectTouchInputDetector());
         }
 
         protected void PresentScore(ScoreInfo score) =>

diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
@@ -279,7 +279,6 @@ private void load(AudioManager audio, OsuColour colours, ManageCollectionsDialog
                 {
                     RelativeSizeAxes = Axes.Both,
                 },
-                new SongSelectTouchInputDetector()
             });
 
             if (ShowFooter)
-Original file line number
+Diff line change
@@ Expand Up @@
                     {
                         RelativeSizeAxes = Axes.Both,
                     },
-                    new SongSelectTouchInputDetector()
                 });
                 if (ShowFooter)
@@ Expand Down @@