From 88d0756107f6e2c0a1955f64a68de6553d680631 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 6 Sep 2019 17:17:30 +0900
Subject: [PATCH 1/6] Allow global actions to propagate through pause screen

---
 osu.Game/Screens/Play/GameplayMenuOverlay.cs | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/osu.Game/Screens/Play/GameplayMenuOverlay.cs b/osu.Game/Screens/Play/GameplayMenuOverlay.cs
index c5202fa792..f54d638584 100644
--- a/osu.Game/Screens/Play/GameplayMenuOverlay.cs
+++ b/osu.Game/Screens/Play/GameplayMenuOverlay.cs
@@ -313,5 +313,22 @@ namespace osu.Game.Screens.Play
                 return base.OnMouseMove(e);
             }
         }
+
+        [Resolved]
+        private GlobalActionContainer globalAction { get; set; }
+
+        protected override bool Handle(UIEvent e)
+        {
+            switch (e)
+            {
+                case ScrollEvent _:
+                    if (ReceivePositionalInputAt(e.ScreenSpaceMousePosition))
+                        return globalAction.TriggerEvent(e);
+
+                    break;
+            }
+
+            return base.Handle(e);
+        }
     }
 }

From 95baae5088de6333deebece25b66c42869793a7a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 6 Sep 2019 18:27:54 +0900
Subject: [PATCH 2/6] Fix dragging from inside to outside an overlay
 incorrectly hiding

---
 .../Containers/OsuFocusedOverlayContainer.cs  | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs b/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs
index 9c948d6f90..a4121acfca 100644
--- a/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs
+++ b/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs
@@ -62,21 +62,31 @@ namespace osu.Game.Graphics.Containers
 
         protected override bool OnClick(ClickEvent e)
         {
-            closeIfOutside(e);
+            if (!base.ReceivePositionalInputAt(e.ScreenSpaceMousePosition))
+                Hide();
 
             return base.OnClick(e);
         }
 
-        protected override bool OnDragEnd(DragEndEvent e)
-        {
-            closeIfOutside(e);
-            return base.OnDragEnd(e);
-        }
+        private bool closeOnDragEnd;
 
-        private void closeIfOutside(MouseEvent e)
+        protected override bool OnDragStart(DragStartEvent e)
         {
             if (!base.ReceivePositionalInputAt(e.ScreenSpaceMousePosition))
+                closeOnDragEnd = true;
+
+            return base.OnDragStart(e);
+        }
+
+        protected override bool OnDragEnd(DragEndEvent e)
+        {
+            if (closeOnDragEnd)
+            {
                 Hide();
+                closeOnDragEnd = false;
+            }
+
+            return base.OnDragEnd(e);
         }
 
         public virtual bool OnPressed(GlobalAction action)

From c397ab62821a91ccca252b2e627f90f9c89bdc1e Mon Sep 17 00:00:00 2001
From: miterosan <miterosan@gmail.com>
Date: Sat, 7 Sep 2019 17:04:13 +0200
Subject: [PATCH 3/6] Fix Android Builds.

---
 osu.Android.props | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index adc340a734..03c6889a69 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -14,7 +14,7 @@
     <TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
     <AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
     <DebugSymbols>True</DebugSymbols>
     <DebugType>portable</DebugType>
     <Optimize>False</Optimize>
@@ -30,12 +30,12 @@
     <AndroidSupportedAbis>armeabi-v7a;x86;arm64-v8a</AndroidSupportedAbis>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
     <DebugSymbols>false</DebugSymbols>
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
     <ErrorReport>prompt</ErrorReport>
-	<EnableLLVM>true</EnableLLVM>
+    <EnableLLVM>true</EnableLLVM>
     <AndroidManagedSymbols>false</AndroidManagedSymbols>
     <AndroidLinkMode>SdkOnly</AndroidLinkMode>
     <AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>

From 6581e51d6af714cae1763a1f28d79013f9756a25 Mon Sep 17 00:00:00 2001
From: miterosan <miterosan@gmail.com>
Date: Sat, 7 Sep 2019 18:03:33 +0200
Subject: [PATCH 4/6] Add a default for the configuration into the android
 props.

This allows building even if no configuration is specified.
---
 osu.Android.props | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Android.props b/osu.Android.props
index 03c6889a69..4962064853 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -1,5 +1,6 @@
 <Project>
   <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <OutputPath>bin\$(Configuration)</OutputPath>
     <WarningLevel>4</WarningLevel>
     <SchemaVersion>2.0</SchemaVersion>

From d790656b7ed9feee90fd419c56e85797aa3f9e3a Mon Sep 17 00:00:00 2001
From: miterosan <miterosan@gmail.com>
Date: Sun, 8 Sep 2019 15:33:16 +0200
Subject: [PATCH 5/6] Revert shortening the condition

---
 osu.Android.props | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index 4962064853..a84b877a98 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -15,7 +15,7 @@
     <TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
     <AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>True</DebugSymbols>
     <DebugType>portable</DebugType>
     <Optimize>False</Optimize>
@@ -31,7 +31,7 @@
     <AndroidSupportedAbis>armeabi-v7a;x86;arm64-v8a</AndroidSupportedAbis>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugSymbols>false</DebugSymbols>
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>

From 8862cdab9c719a093d47c49dd9be546fc655f8eb Mon Sep 17 00:00:00 2001
From: miterosan <miterosan@gmail.com>
Date: Sun, 8 Sep 2019 15:33:51 +0200
Subject: [PATCH 6/6] Also set the default for Platform

---
 osu.Android.props | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Android.props b/osu.Android.props
index a84b877a98..896b10133d 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -1,6 +1,7 @@
 <Project>
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <OutputPath>bin\$(Configuration)</OutputPath>
     <WarningLevel>4</WarningLevel>
     <SchemaVersion>2.0</SchemaVersion>