From 458c3a355fd0c6d20d656a68aaac7e73c5c9cd04 Mon Sep 17 00:00:00 2001
From: Kelvin <2yangk23@gmail.com>
Date: Mon, 28 Aug 2017 23:28:58 -0700
Subject: [PATCH] Rearrange dragging using cheeseburger icon only

---
 osu.Game/Overlays/Music/PlaylistItem.cs | 77 ++++++++++++++-----------
 1 file changed, 42 insertions(+), 35 deletions(-)

diff --git a/osu.Game/Overlays/Music/PlaylistItem.cs b/osu.Game/Overlays/Music/PlaylistItem.cs
index 6c7e590a88..876ad4f767 100644
--- a/osu.Game/Overlays/Music/PlaylistItem.cs
+++ b/osu.Game/Overlays/Music/PlaylistItem.cs
@@ -71,15 +71,9 @@ namespace osu.Game.Overlays.Music
 
             Children = new Drawable[]
             {
-                handle = new SpriteIcon
+                handle = new PlaylistItemHandle(playlist)
                 {
-                    Anchor = Anchor.TopLeft,
-                    Origin = Anchor.TopLeft,
-                    Size = new Vector2(12),
                     Colour = colours.Gray5,
-                    Icon = FontAwesome.fa_bars,
-                    Alpha = 0f,
-                    Margin = new MarginPadding { Left = 5, Top = 2 },
                 },
                 text = new OsuTextFlowContainer
                 {
@@ -135,34 +129,6 @@ namespace osu.Game.Overlays.Music
             return true;
         }
 
-        protected override bool OnDragStart(InputState state)
-        {
-            return true;
-        }
-
-        protected override bool OnDrag(InputState state)
-        {
-            int src = (int)Depth;
-            int dst = MathHelper.Clamp((int)(state.Mouse.Position.Y / Height), 0, playlist.Count - 1);
-
-            if (src == dst)
-                return true;
-
-            if (src < dst)
-            {
-                for (int i = src + 1; i <= dst; i++)
-                    playlist.ChangeChildDepth(playlist[i], i - 1);
-            }
-            else
-            {
-                for (int i = dst; i < src; i++)
-                    playlist.ChangeChildDepth(playlist[i], i + 1);
-            }
-
-            playlist.ChangeChildDepth(this, dst);
-            return true;
-        }
-
         public string[] FilterTerms { get; private set; }
 
         private bool matching = true;
@@ -179,5 +145,46 @@ namespace osu.Game.Overlays.Music
                 this.FadeTo(matching ? 1 : 0, 200);
             }
         }
+
+        private class PlaylistItemHandle : SpriteIcon
+        {
+            private readonly FillFlowContainer<PlaylistItem> playlist;
+
+            public PlaylistItemHandle(FillFlowContainer<PlaylistItem> playlist)
+            {
+                this.playlist = playlist;
+                Anchor = Anchor.TopLeft;
+                Origin = Anchor.TopLeft;
+                Size = new Vector2(12);
+                Icon = FontAwesome.fa_bars;
+                Alpha = 0f;
+                Margin = new MarginPadding { Left = 5, Top = 2 };
+            }
+
+            protected override bool OnDragStart(InputState state) => true;
+
+            protected override bool OnDrag(InputState state)
+            {
+                int src = (int)Parent.Depth;
+                int dst = MathHelper.Clamp((int)((state.Mouse.Position.Y + Parent.Position.Y) / Parent.Height), 0, playlist.Count - 1);
+
+                if (src == dst)
+                    return true;
+
+                if (src < dst)
+                {
+                    for (int i = src + 1; i <= dst; i++)
+                        playlist.ChangeChildDepth(playlist[i], i - 1);
+                }
+                else
+                {
+                    for (int i = dst; i < src; i++)
+                        playlist.ChangeChildDepth(playlist[i], i + 1);
+                }
+
+                playlist.ChangeChildDepth(Parent as PlaylistItem, dst);
+                return true;
+            }
+        }
     }
 }