From dde3a68c8f7f1d5eb471dee9a8883ec5b4e53e93 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 14 Nov 2016 16:40:13 +0900
Subject: [PATCH 1/3] Account for anchor when dragging MusicController (fixes
 VisualTest).

---
 osu.Game/Overlays/MusicController.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index 5f7ffe6243..2ae9b74d8f 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -179,7 +179,9 @@ namespace osu.Game.Overlays
         protected override bool OnDrag(InputState state)
         {
             Vector2 change = (state.Mouse.Position - state.Mouse.PositionMouseDown.Value);
-            change.X = -change.X;
+
+            if ((Anchor & Anchor.x2) > 0)
+                change.X = -change.X;
 
             change *= (float)Math.Pow(change.Length, 0.7f) / change.Length;
 

From 0b203a7bf4b613d2aa539f2b6ece5cf46d930dcb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 14 Nov 2016 16:50:17 +0900
Subject: [PATCH 2/3] Move enum to end of file.

---
 osu.Game/Beatmaps/Objects/Osu/OsuBaseHit.cs | 28 ++++++++++-----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Beatmaps/Objects/Osu/OsuBaseHit.cs b/osu.Game/Beatmaps/Objects/Osu/OsuBaseHit.cs
index e4bb272404..41d815444b 100644
--- a/osu.Game/Beatmaps/Objects/Osu/OsuBaseHit.cs
+++ b/osu.Game/Beatmaps/Objects/Osu/OsuBaseHit.cs
@@ -11,20 +11,6 @@ namespace osu.Game.Beatmaps.Objects.Osu
     {
         public Vector2 Position { get; set; }
 
-        [Flags]
-        private enum HitObjectType
-        {
-            Circle = 1,
-            Slider = 2,
-            NewCombo = 4,
-            CircleNewCombo = 5,
-            SliderNewCombo = 6,
-            Spinner = 8,
-            ColourHax = 122,
-            Hold = 128,
-            ManiaLong = 128,
-        }
-
         public static OsuBaseHit Parse(string val)
         {
             string[] split = val.Split(',');
@@ -54,5 +40,19 @@ namespace osu.Game.Beatmaps.Objects.Osu
             // TODO: "addition" field
             return result;
         }
+
+        [Flags]
+        private enum HitObjectType
+        {
+            Circle = 1,
+            Slider = 2,
+            NewCombo = 4,
+            CircleNewCombo = 5,
+            SliderNewCombo = 6,
+            Spinner = 8,
+            ColourHax = 122,
+            Hold = 128,
+            ManiaLong = 128,
+        }
     }
 }

From f6b13bc3226aa4b286405bc1db0f503ff8d3a318 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 14 Nov 2016 16:50:27 +0900
Subject: [PATCH 3/3] Update framework.

---
 osu-framework | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu-framework b/osu-framework
index 1cb936a4fe..87a5cd4ce4 160000
--- a/osu-framework
+++ b/osu-framework
@@ -1 +1 @@
-Subproject commit 1cb936a4fe9e699ee37deb34eed0b04bc06167e3
+Subproject commit 87a5cd4ce48d6370b8e392378289825f4b4a2039