From 731184eb39b7ad0f6d11c4aeaf32eaef52a11316 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Dec 2022 13:43:01 +0900
Subject: [PATCH] Revert "Merge pull request #21614 from EVAST9919/button-fix"

This reverts commit 4bd196684fe26b146986b04f8af5c75735774817, reversing
changes made to a1d22ef77a0dd71aff97b17fd656ac68d347d4d7.
---
 .../UserInterface/TestSceneSettingsButton.cs  | 41 -------------------
 osu.Game/Overlays/Settings/SettingsButton.cs  |  4 --
 2 files changed, 45 deletions(-)
 delete mode 100644 osu.Game.Tests/Visual/UserInterface/TestSceneSettingsButton.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneSettingsButton.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneSettingsButton.cs
deleted file mode 100644
index 4353e7ffef..0000000000
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneSettingsButton.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-// 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.
-
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics;
-using osu.Game.Overlays.Settings;
-using NUnit.Framework;
-using osuTK;
-using osu.Game.Overlays;
-
-namespace osu.Game.Tests.Visual.UserInterface
-{
-    public partial class TestSceneSettingsButton : OsuManualInputManagerTestScene
-    {
-        private readonly SettingsButton settingsButton;
-
-        public TestSceneSettingsButton()
-        {
-            Add(new Container
-            {
-                AutoSizeAxes = Axes.Y,
-                Width = 500,
-                Child = settingsButton = new SettingsButton
-                {
-                    Enabled = { Value = true },
-                    Text = "Test settings button"
-                }
-            });
-        }
-
-        [Test]
-        public void TestInputAtPaddedArea()
-        {
-            AddStep("Move cursor to button", () => InputManager.MoveMouseTo(settingsButton));
-            AddAssert("Button is hovered", () => settingsButton.IsHovered);
-            AddStep("Move cursor to padded area", () => InputManager.MoveMouseTo(settingsButton.ScreenSpaceDrawQuad.TopLeft + new Vector2(SettingsPanel.CONTENT_MARGINS / 2f, 10)));
-            AddAssert("Cursor within a button", () => settingsButton.ScreenSpaceDrawQuad.Contains(InputManager.CurrentState.Mouse.Position));
-            AddAssert("Button is not hovered", () => !settingsButton.IsHovered);
-        }
-    }
-}
diff --git a/osu.Game/Overlays/Settings/SettingsButton.cs b/osu.Game/Overlays/Settings/SettingsButton.cs
index 68cb95a2d8..5091ddc2d0 100644
--- a/osu.Game/Overlays/Settings/SettingsButton.cs
+++ b/osu.Game/Overlays/Settings/SettingsButton.cs
@@ -9,15 +9,11 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Cursor;
 using osu.Framework.Localisation;
 using osu.Game.Graphics.UserInterfaceV2;
-using osuTK;
 
 namespace osu.Game.Overlays.Settings
 {
     public partial class SettingsButton : RoundedButton, IHasTooltip, IConditionalFilterable
     {
-        // We don't want to receive input at the padded area
-        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => Content.ReceivePositionalInputAt(screenSpacePos);
-
         public SettingsButton()
         {
             RelativeSizeAxes = Axes.X;