Merge remote-tracking branch 'upstream/master' into add-chat-truncation

osu.Android.props

@@ -1,5 +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>

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)
+        private bool closeOnDragEnd;
-        {
-            closeIfOutside(e);
-            return base.OnDragEnd(e);
-        }
 
-        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)

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);
+        }
     }
 }