From 0f4b40ab15b2727d5cf66c2f0a3bf606403e9c51 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 21 Apr 2022 16:15:10 +0900
Subject: [PATCH] Add better click-to-dismiss logic for sheared overlays

---
 osu.Game/Graphics/InputBlockingContainer.cs   | 21 +++++++++++++++++++
 .../UserInterface/ShearedOverlayHeader.cs     |  2 +-
 .../Overlays/Mods/ShearedOverlayContainer.cs  | 15 ++++++++++++-
 3 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 osu.Game/Graphics/InputBlockingContainer.cs

diff --git a/osu.Game/Graphics/InputBlockingContainer.cs b/osu.Game/Graphics/InputBlockingContainer.cs
new file mode 100644
index 0000000000..d8387b1401
--- /dev/null
+++ b/osu.Game/Graphics/InputBlockingContainer.cs
@@ -0,0 +1,21 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+#nullable enable
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Input.Events;
+
+namespace osu.Game.Graphics
+{
+    /// <summary>
+    /// A simple container which blocks input events from travelling through it.
+    /// </summary>
+    public class InputBlockingContainer : Container
+    {
+        protected override bool OnHover(HoverEvent e) => true;
+
+        protected override bool OnMouseDown(MouseDownEvent e) => true;
+
+        protected override bool OnClick(ClickEvent e) => true;
+    }
+}
diff --git a/osu.Game/Graphics/UserInterface/ShearedOverlayHeader.cs b/osu.Game/Graphics/UserInterface/ShearedOverlayHeader.cs
index 9ed7bb35de..452a1dd394 100644
--- a/osu.Game/Graphics/UserInterface/ShearedOverlayHeader.cs
+++ b/osu.Game/Graphics/UserInterface/ShearedOverlayHeader.cs
@@ -66,7 +66,7 @@ namespace osu.Game.Graphics.UserInterface
                 },
                 Children = new Drawable[]
                 {
-                    underlayContainer = new Container
+                    underlayContainer = new InputBlockingContainer
                     {
                         RelativeSizeAxes = Axes.X,
                         Height = HEIGHT,
diff --git a/osu.Game/Overlays/Mods/ShearedOverlayContainer.cs b/osu.Game/Overlays/Mods/ShearedOverlayContainer.cs
index 62ed736dc2..eca192c8e5 100644
--- a/osu.Game/Overlays/Mods/ShearedOverlayContainer.cs
+++ b/osu.Game/Overlays/Mods/ShearedOverlayContainer.cs
@@ -5,6 +5,8 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Input.Events;
+using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
 
@@ -88,7 +90,7 @@ namespace osu.Game.Overlays.Mods
                             Bottom = footer_height + PADDING,
                         }
                     },
-                    Footer = new Container
+                    Footer = new InputBlockingContainer
                     {
                         RelativeSizeAxes = Axes.X,
                         Depth = float.MinValue,
@@ -113,6 +115,17 @@ namespace osu.Game.Overlays.Mods
             };
         }
 
+        protected override bool OnClick(ClickEvent e)
+        {
+            if (State.Value == Visibility.Visible)
+            {
+                Hide();
+                return true;
+            }
+
+            return base.OnClick(e);
+        }
+
         protected override void PopIn()
         {
             const double fade_in_duration = 400;