Merge pull request #35399 from smoogipoo/qp-view-beatmap

Fix quick play "view beatmap" not showing beatmap overlay

Author: peppy

osu.Game.Tests/Visual/Matchmaking/TestSceneBeatmapSelectPanel.cs

@@ -4,6 +4,7 @@
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
+using osu.Game.Graphics.Cursor;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Online.Rooms;
@@ -23,10 +24,17 @@ public void TestBeatmapPanel()
         {
             BeatmapSelectPanel? panel = null;
 
-            AddStep("add panel", () => Child = panel = new BeatmapSelectPanel(new MultiplayerPlaylistItem())
+            AddStep("add panel", () =>
             {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
+                Child = new OsuContextMenuContainer
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Child = panel = new BeatmapSelectPanel(new MultiplayerPlaylistItem())
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                    }
+                };
             });
 
             AddStep("add maarvin", () => panel!.AddUser(new APIUser

osu.Game/Screens/OnlinePlay/Matchmaking/Match/BeatmapSelect/BeatmapCardMatchmaking.cs

@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <[email protected]>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
@@ -19,6 +20,7 @@
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Localisation;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Overlays;
@@ -315,7 +317,7 @@ public override MenuItem[] ContextMenuItems
         {
             get
             {
-                var items = base.ContextMenuItems.ToList();
+                List<MenuItem> items = [new OsuMenuItem(ContextMenuStrings.ViewBeatmap, MenuItemType.Highlighted, DefaultAction)];
 
                 foreach (var button in buttonContainer.Buttons)
                 {

osu.Game/Screens/OnlinePlay/Matchmaking/Match/BeatmapSelect/BeatmapSelectPanel.cs

@@ -45,8 +45,6 @@ public partial class BeatmapSelectPanel : Container
 
         private BeatmapCardMatchmaking? card;
 
-        public override bool PropagatePositionalInputSubTree => AllowSelection;
-
         public BeatmapSelectPanel(MultiplayerPlaylistItem item)
         {
             Item = item;
@@ -119,7 +117,11 @@ private void load(BeatmapLookupCache lookupCache, OverlayColourProvider colourPr
                 mainContent.Add(card = new BeatmapCardMatchmaking(beatmap)
                 {
                     Depth = float.MaxValue,
-                    Action = () => Action?.Invoke(Item),
+                    Action = () =>
+                    {
+                        if (AllowSelection)
+                            Action?.Invoke(Item);
+                    },
                 });
 
                 foreach (var user in users)
@@ -141,11 +143,15 @@ public void RemoveUser(APIUser user)
 
         protected override bool OnHover(HoverEvent e)
         {
-            lighting.FadeTo(0.2f, 50)
-                    .Then()
-                    .FadeTo(0.1f, 300);
+            if (AllowSelection)
+            {
+                lighting.FadeTo(0.2f, 50)
+                        .Then()
+                        .FadeTo(0.1f, 300);
+                return true;
+            }
 
-            return true;
+            return base.OnHover(e);
         }
 
         protected override void OnHoverLost(HoverLostEvent e)
@@ -157,11 +163,8 @@ protected override void OnHoverLost(HoverLostEvent e)
 
         protected override bool OnMouseDown(MouseDownEvent e)
         {
-            if (e.Button == MouseButton.Left)
-            {
+            if (AllowSelection && e.Button == MouseButton.Left)
                 scaleContainer.ScaleTo(0.95f, 400, Easing.OutExpo);
-                return true;
-            }
 
             return base.OnMouseDown(e);
         }
@@ -171,16 +174,17 @@ protected override void OnMouseUp(MouseUpEvent e)
             base.OnMouseUp(e);
 
             if (e.Button == MouseButton.Left)
-            {
                 scaleContainer.ScaleTo(1f, 500, Easing.OutElasticHalf);
-            }
         }
 
         protected override bool OnClick(ClickEvent e)
         {
-            lighting.FadeTo(0.5f, 50)
-                    .Then()
-                    .FadeTo(0.1f, 400);
+            if (AllowSelection)
+            {
+                lighting.FadeTo(0.5f, 50)
+                        .Then()
+                        .FadeTo(0.1f, 400);
+            }
 
             // pass through to let the beatmap card handle actual click.
             return false;