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] 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)