Merge branch 'master' of git://github.com/ppy/osu into tooltips

# Conflicts:
#	osu.Game/Graphics/Cursor/MenuCursor.cs

osu.Desktop.VisualTests/Beatmaps/TestWorkingBeatmap.cs

@@ -16,7 +16,7 @@ namespace osu.Desktop.VisualTests.Beatmaps
         }
 
         private readonly Beatmap beatmap;
-        
+
         protected override Beatmap GetBeatmap() => beatmap;
         protected override Texture GetBackground() => null;
         protected override Track GetTrack() => null;

osu.Desktop.VisualTests/Platform/TestStorage.cs

@@ -15,7 +15,7 @@ namespace osu.Desktop.VisualTests.Platform
         public TestStorage(string baseName) : base(baseName)
         {
         }
-        
+
         public override SQLiteConnection GetDatabase(string name)
         {
             ISQLitePlatform platform;

osu.Desktop.VisualTests/Tests/TestCaseBeatmapDetails.cs

@@ -0,0 +1,65 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Primitives;
+using osu.Framework.Testing;
+using osu.Game.Database;
+using osu.Game.Screens.Select;
+using System.Linq;
+
+namespace osu.Desktop.VisualTests.Tests
+{
+    internal class TestCaseBeatmapDetails : TestCase
+    {
+        public override string Description => "BeatmapDetails tab of BeatmapDetailArea";
+
+        private BeatmapDetails details;
+
+        public override void Reset()
+        {
+            base.Reset();
+
+            Add(details = new BeatmapDetails
+            {
+                RelativeSizeAxes = Axes.Both,
+                Padding = new MarginPadding(150),
+                Beatmap = new BeatmapInfo
+                {
+                    Version = "VisualTest",
+                    Metadata = new BeatmapMetadata
+                    {
+                        Source = "Some guy",
+                        Tags = "beatmap metadata example with a very very long list of tags and not much creativity",
+                    },
+                    Difficulty = new BeatmapDifficulty
+                    {
+                        CircleSize = 7,
+                        ApproachRate = 3.5f,
+                        OverallDifficulty = 5.7f,
+                        DrainRate = 1,
+                    },
+                    StarDifficulty = 5.3f,
+                    Metrics = new BeatmapMetrics
+                    {
+                        Ratings = Enumerable.Range(0,10),
+                        Fails = Enumerable.Range(lastRange, 100).Select(i => i % 12 - 6),
+                        Retries = Enumerable.Range(lastRange - 3, 100).Select(i => i % 12 - 6),
+                    },
+                },
+            });
+
+            AddRepeatStep("fail values", newRetryAndFailValues, 10);
+        }
+
+        private int lastRange = 1;
+
+        private void newRetryAndFailValues()
+        {
+            details.Beatmap.Metrics.Fails = Enumerable.Range(lastRange, 100).Select(i => i % 12 - 6);
+            details.Beatmap.Metrics.Retries = Enumerable.Range(lastRange - 3, 100).Select(i => i % 12 - 6);
+            details.Beatmap = details.Beatmap;
+            lastRange += 100;
+        }
+    }
+}

osu.Desktop.VisualTests/Tests/TestCaseChatDisplay.cs

@@ -3,15 +3,12 @@
 
 using osu.Framework.Testing;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Threading;
 using osu.Game.Overlays;
 
 namespace osu.Desktop.VisualTests.Tests
 {
     internal class TestCaseChatDisplay : TestCase
     {
-        private ScheduledDelegate messageRequest;
-
         public override string Description => @"Testing chat api and overlay";
 
         public override void Reset()

osu.Desktop.VisualTests/Tests/TestCaseGraph.cs

@@ -0,0 +1,42 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using OpenTK;
+using osu.Framework.Graphics;
+using osu.Framework.Testing;
+using osu.Game.Graphics.UserInterface;
+using System.Linq;
+
+namespace osu.Desktop.VisualTests.Tests
+{
+    internal class TestCaseGraph : TestCase
+    {
+        public override string Description => "graph";
+
+        private BarGraph graph;
+
+        public override void Reset()
+        {
+            base.Reset();
+
+            Children = new[]
+            {
+                graph = new BarGraph
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Size = new Vector2(0.5f),
+                },
+            };
+
+            AddStep("values from 1-10", () => graph.Values = Enumerable.Range(1,10).Select(i => (float)i));
+            AddStep("values from 1-100", () => graph.Values = Enumerable.Range(1, 100).Select(i => (float)i));
+            AddStep("reversed values from 1-10", () => graph.Values = Enumerable.Range(1, 10).Reverse().Select(i => (float)i));
+            AddStep("Bottom to top", () => graph.Direction = BarDirection.BottomToTop);
+            AddStep("Top to bottom", () => graph.Direction = BarDirection.TopToBottom);
+            AddStep("Left to right", () => graph.Direction = BarDirection.LeftToRight);
+            AddStep("Right to left", () => graph.Direction = BarDirection.RightToLeft);
+        }
+    }
+}

osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs

@@ -99,6 +99,7 @@ namespace osu.Desktop.VisualTests.Tests
 
             AddToggleStep(@"auto", state => { auto = state; load(mode); });
 
+            BasicSliderBar<double> sliderBar;
             Add(new Container
             {
                 Anchor = Anchor.TopRight,
@@ -107,16 +108,17 @@ namespace osu.Desktop.VisualTests.Tests
                 Children = new Drawable[]
                 {
                     new SpriteText { Text = "Playback Speed" },
-                    new BasicSliderBar<double>
+                    sliderBar = new BasicSliderBar<double>
                     {
                         Width = 150,
                         Height = 10,
                         SelectionColor = Color4.Orange,
-                        Bindable = playbackSpeed
                     }
                 }
             });
 
+            sliderBar.Current.BindTo(playbackSpeed);
+
             framedClock.ProcessFrame();
 
             var clockAdjustContainer = new Container

osu.Desktop.VisualTests/Tests/TestCaseKeyCounter.cs

@@ -44,6 +44,8 @@ namespace osu.Desktop.VisualTests.Tests
                 kc.Add(new KeyCounterKeyboard(key));
             });
 
+            TestSliderBar<int> sliderBar;
+
             Add(new Container
             {
                 Anchor = Anchor.TopRight,
@@ -52,16 +54,17 @@ namespace osu.Desktop.VisualTests.Tests
                 Children = new Drawable[]
                 {
                     new SpriteText { Text = "FadeTime" },
-                    new TestSliderBar<int>
+                    sliderBar =new TestSliderBar<int>
                     {
                         Width = 150,
                         Height = 10,
                         SelectionColor = Color4.Orange,
-                        Bindable = bindable
                     }
                 }
             });
 
+            sliderBar.Current.BindTo(bindable);
+
             Add(kc);
         }
         private class TestSliderBar<T> : SliderBar<T> where T : struct

osu.Desktop.VisualTests/Tests/TestCaseMenuOverlays.cs

@@ -0,0 +1,59 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Logging;
+using osu.Framework.Testing;
+using osu.Game.Screens.Play;
+
+namespace osu.Desktop.VisualTests.Tests
+{
+    internal class TestCaseMenuOverlays : TestCase
+    {
+        public override string Description => @"Tests pause and fail overlays";
+
+        private PauseOverlay pauseOverlay;
+        private FailOverlay failOverlay;
+        private int retryCount;
+
+        public override void Reset()
+        {
+            base.Reset();
+
+            retryCount = 0;
+
+            Add(pauseOverlay = new PauseOverlay
+            {
+                OnResume = () => Logger.Log(@"Resume"),
+                OnRetry = () => Logger.Log(@"Retry"),
+                OnQuit = () => Logger.Log(@"Quit"),
+            });
+            Add(failOverlay = new FailOverlay
+            {
+                OnRetry = () => Logger.Log(@"Retry"),
+                OnQuit = () => Logger.Log(@"Quit"),
+            });
+
+            AddStep(@"Pause", delegate {
+                if(failOverlay.State == Visibility.Visible)
+                {
+                    failOverlay.Hide();
+                }
+                pauseOverlay.Show();
+            });
+            AddStep("Fail", delegate {
+                if (pauseOverlay.State == Visibility.Visible)
+                {
+                    pauseOverlay.Hide();
+                }
+                failOverlay.Show();
+            });
+            AddStep("Add Retry", delegate
+            {
+                retryCount++;
+                pauseOverlay.Retries = retryCount;
+                failOverlay.Retries = retryCount;
+            });
+        }
+    }
+}

osu.Desktop.VisualTests/Tests/TestCaseMusicController.cs

@@ -30,7 +30,9 @@ namespace osu.Desktop.VisualTests.Tests
                 Anchor = Anchor.Centre
             };
             Add(mc);
-            AddToggleStep(@"Show", state => mc.State = state ? Visibility.Visible : Visibility.Hidden);
+
+            AddToggleStep(@"toggle visibility", state => mc.State = state ? Visibility.Visible : Visibility.Hidden);
+            AddStep(@"show", () => mc.State = Visibility.Visible);
         }
     }
 }

osu.Desktop.VisualTests/Tests/TestCasePauseOverlay.cs

@@ -1,38 +0,0 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using osu.Framework.Logging;
-using osu.Framework.Testing;
-using osu.Game.Screens.Play;
-
-namespace osu.Desktop.VisualTests.Tests
-{
-    internal class TestCasePauseOverlay : TestCase
-    {
-        public override string Description => @"Tests the pause overlay";
-
-        private PauseOverlay pauseOverlay;
-        private int retryCount;
-
-        public override void Reset()
-        {
-            base.Reset();
-
-            Add(pauseOverlay = new PauseOverlay
-            {
-                Depth = -1,
-                OnResume = () => Logger.Log(@"Resume"),
-                OnRetry = () => Logger.Log(@"Retry"),
-                OnQuit = () => Logger.Log(@"Quit")
-            });
-            AddStep("Pause", pauseOverlay.Show);
-            AddStep("Add Retry", delegate
-            {
-                retryCount++;
-                pauseOverlay.Retries = retryCount;
-            });
-
-            retryCount = 0;
-        }
-    }
-}

osu.Desktop.VisualTests/Tests/TestCasePlaySongSelect.cs

@@ -14,7 +14,7 @@ namespace osu.Desktop.VisualTests.Tests
 {
     internal class TestCasePlaySongSelect : TestCase
     {
-        private BeatmapDatabase db, oldDb;
+        private BeatmapDatabase db;
         private TestStorage storage;
         private PlaySongSelect songSelect;
 
@@ -44,13 +44,13 @@ namespace osu.Desktop.VisualTests.Tests
             AddStep(@"Sort by Difficulty", delegate { songSelect.FilterControl.Sort = SortMode.Difficulty; });
         }
 
-        protected override void Dispose(bool isDisposing)
-        {
-            if (oldDb != null)
-                db = null;
+        //protected override void Dispose(bool isDisposing)
+        //{
+        //    if (oldDb != null)
+        //        db = null;
 
-            base.Dispose(isDisposing);
-        }
+        //    base.Dispose(isDisposing);
+        //}
 
         private BeatmapSetInfo createTestBeatmapSet(int i)
         {

osu.Desktop.VisualTests/Tests/TestCasePlayer.cs

@@ -83,10 +83,7 @@ namespace osu.Desktop.VisualTests.Tests
                 Colour = Color4.Black,
             });
 
-            Add(new PlayerLoader(Player = CreatePlayer(beatmap))
-            {
-                Beatmap = beatmap
-            });
+            Add(Player = CreatePlayer(beatmap));
         }
 
         protected virtual Player CreatePlayer(WorkingBeatmap beatmap)

osu.Desktop.VisualTests/Tests/TestCaseReplay.cs

@@ -1,24 +1,15 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using osu.Framework.Input.Handlers;
 using osu.Game.Beatmaps;
 using osu.Game.Modes.Mods;
 using osu.Game.Modes.Osu.Mods;
 using osu.Game.Screens.Play;
-using System;
-using System.IO;
 
 namespace osu.Desktop.VisualTests.Tests
 {
     internal class TestCaseReplay : TestCasePlayer
     {
-        private WorkingBeatmap beatmap;
-
-        private InputHandler replay;
-
-        private Func<Stream> getReplayStream;
-
         public override string Description => @"Testing replay playback.";
 
         protected override Player CreatePlayer(WorkingBeatmap beatmap)

osu.Desktop.VisualTests/Tests/TestCaseScoreCounter.cs

@@ -22,8 +22,6 @@ namespace osu.Desktop.VisualTests.Tests
 
             int numerator = 0, denominator = 0;
 
-            bool maniaHold = false;
-
             ScoreCounter score = new ScoreCounter(7)
             {
                 Origin = Anchor.TopRight,

osu.Desktop.VisualTests/Tests/TestCaseTabControl.cs

@@ -36,9 +36,9 @@ namespace osu.Desktop.VisualTests.Tests
             filter.PinItem(GroupMode.All);
             filter.PinItem(GroupMode.RecentlyPlayed);
 
-            filter.ItemChanged += (sender, mode) =>
+            filter.Current.ValueChanged += newFilter =>
             {
-                text.Text = "Currently Selected: " + mode.ToString();
+                text.Text = "Currently Selected: " + newFilter.ToString();
             };
         }
     }

osu.Desktop.VisualTests/Tests/TestCaseTaikoHitObjects.cs

@@ -1,13 +1,12 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
+using System.Linq;
 using OpenTK;
 using OpenTK.Graphics;
-using osu.Framework.Allocation;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Testing;
-using osu.Game.Graphics;
-using osu.Game.Modes.Taiko.Objects.Drawable.Pieces;
+using osu.Game.Modes.Taiko.Objects.Drawables.Pieces;
 
 namespace osu.Desktop.VisualTests.Tests
 {
@@ -24,13 +23,12 @@ namespace osu.Desktop.VisualTests.Tests
             AddToggleStep("Kiai", b =>
             {
                 kiai = !kiai;
-                Reset();
+                updateKiaiState();
             });
 
             Add(new CirclePiece
             {
                 Position = new Vector2(100, 100),
-                Width = 0,
                 AccentColour = Color4.DarkRed,
                 KiaiMode = kiai,
                 Children = new[]
@@ -39,10 +37,9 @@ namespace osu.Desktop.VisualTests.Tests
                 }
             });
 
-            Add(new StrongCirclePiece
+            Add(new CirclePiece(true)
             {
                 Position = new Vector2(350, 100),
-                Width = 0,
                 AccentColour = Color4.DarkRed,
                 KiaiMode = kiai,
                 Children = new[]
@@ -54,7 +51,6 @@ namespace osu.Desktop.VisualTests.Tests
             Add(new CirclePiece
             {
                 Position = new Vector2(100, 300),
-                Width = 0,
                 AccentColour = Color4.DarkBlue,
                 KiaiMode = kiai,
                 Children = new[]
@@ -63,10 +59,9 @@ namespace osu.Desktop.VisualTests.Tests
                 }
             });
 
-            Add(new StrongCirclePiece
+            Add(new CirclePiece(true)
             {
                 Position = new Vector2(350, 300),
-                Width = 0,
                 AccentColour = Color4.DarkBlue,
                 KiaiMode = kiai,
                 Children = new[]
@@ -78,7 +73,6 @@ namespace osu.Desktop.VisualTests.Tests
             Add(new CirclePiece
             {
                 Position = new Vector2(100, 500),
-                Width = 0,
                 AccentColour = Color4.Orange,
                 KiaiMode = kiai,
                 Children = new[]
@@ -87,37 +81,29 @@ namespace osu.Desktop.VisualTests.Tests
                 }
             });
 
-            Add(new DrumRollCircle(new CirclePiece
+            Add(new ElongatedCirclePiece
             {
-                KiaiMode = kiai
-            })
-            {
-                Width = 250,
-                Position = new Vector2(575, 100)
+                Position = new Vector2(575, 100),
+                AccentColour = Color4.Orange,
+                KiaiMode = kiai,
+                Length = 0.10f,
+                PlayfieldLengthReference = () => DrawSize.X
             });
 
-            Add(new DrumRollCircle(new StrongCirclePiece
+            Add(new ElongatedCirclePiece(true)
             {
-                KiaiMode = kiai
-            })
-            {
-                Width = 250,
-                Position = new Vector2(575, 300)
+                Position = new Vector2(575, 300),
+                AccentColour = Color4.Orange,
+                KiaiMode = kiai,
+                Length = 0.10f,
+                PlayfieldLengthReference = () => DrawSize.X
             });
         }
 
-        private class DrumRollCircle : BaseCircle
+        private void updateKiaiState()
         {
-            public DrumRollCircle(CirclePiece piece)
-                : base(piece)
-            {
-            }
-
-            [BackgroundDependencyLoader]
-            private void load(OsuColour colours)
-            {
-                Piece.AccentColour = colours.YellowDark;
-            }
+            foreach (var c in Children.OfType<CirclePiece>())
+                c.KiaiMode = kiai;
         }
 
         private abstract class BaseCircle : Container

osu.Desktop.VisualTests/Tests/TestCaseTaikoPlayfield.cs

@@ -1,24 +1,33 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
+using OpenTK;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Primitives;
 using osu.Framework.MathUtils;
 using osu.Framework.Testing;
+using osu.Framework.Timing;
 using osu.Game.Modes.Objects.Drawables;
 using osu.Game.Modes.Taiko.Judgements;
 using osu.Game.Modes.Taiko.Objects;
-using osu.Game.Modes.Taiko.Objects.Drawable;
+using osu.Game.Modes.Taiko.Objects.Drawables;
 using osu.Game.Modes.Taiko.UI;
+using System;
 
 namespace osu.Desktop.VisualTests.Tests
 {
     internal class TestCaseTaikoPlayfield : TestCase
     {
+        private const double default_duration = 300;
+        private const float scroll_time = 1000;
+
         public override string Description => "Taiko playfield";
 
+        protected override double TimePerAction => default_duration * 2;
+
+        private readonly Random rng = new Random(1337);
         private TaikoPlayfield playfield;
+        private Container playfieldContainer;
 
         public override void Reset()
         {
@@ -26,17 +35,31 @@ namespace osu.Desktop.VisualTests.Tests
 
             AddStep("Hit!", addHitJudgement);
             AddStep("Miss :(", addMissJudgement);
-            AddStep("Swell", addSwell);
+            AddStep("DrumRoll", () => addDrumRoll(false));
+            AddStep("Strong DrumRoll", () => addDrumRoll(true));
+            AddStep("Swell", () => addSwell());
             AddStep("Centre", () => addCentreHit(false));
             AddStep("Strong Centre", () => addCentreHit(true));
             AddStep("Rim", () => addRimHit(false));
             AddStep("Strong Rim", () => addRimHit(true));
+            AddStep("Add bar line", () => addBarLine(false));
+            AddStep("Add major bar line", () => addBarLine(true));
+            AddStep("Height test 1", () => changePlayfieldSize(1));
+            AddStep("Height test 2", () => changePlayfieldSize(2));
+            AddStep("Height test 3", () => changePlayfieldSize(3));
+            AddStep("Height test 4", () => changePlayfieldSize(4));
+            AddStep("Height test 5", () => changePlayfieldSize(5));
+            AddStep("Reset height", () => changePlayfieldSize(6));
 
-            Add(new Container
+            var rateAdjustClock = new StopwatchClock(true) { Rate = 1 };
+
+            Add(playfieldContainer = new Container
             {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
                 RelativeSizeAxes = Axes.X,
-                Y = 200,
-                Padding = new MarginPadding { Left = 200 },
+                Height = TaikoPlayfield.DEFAULT_PLAYFIELD_HEIGHT,
+                Clock = new FramedClock(rateAdjustClock),
                 Children = new[]
                 {
                     playfield = new TaikoPlayfield()
@@ -44,21 +67,63 @@ namespace osu.Desktop.VisualTests.Tests
             });
         }
 
+        private void changePlayfieldSize(int step)
+        {
+            // Add new hits
+            switch (step)
+            {
+                case 1:
+                    addCentreHit(false);
+                    break;
+                case 2:
+                    addCentreHit(true);
+                    break;
+                case 3:
+                    addDrumRoll(false);
+                    break;
+                case 4:
+                    addDrumRoll(true);
+                    break;
+                case 5:
+                    addSwell(1000);
+                    playfieldContainer.Delay(scroll_time - 100);
+                    break;
+            }
+
+            // Tween playfield height
+            switch (step)
+            {
+                default:
+                    playfieldContainer.ResizeTo(new Vector2(1, rng.Next(25, 400)), 500);
+                    break;
+                case 6:
+                    playfieldContainer.ResizeTo(new Vector2(1, TaikoPlayfield.DEFAULT_PLAYFIELD_HEIGHT), 500);
+                    break;
+            }
+        }
+
         private void addHitJudgement()
         {
             TaikoHitResult hitResult = RNG.Next(2) == 0 ? TaikoHitResult.Good : TaikoHitResult.Great;
 
-            playfield.OnJudgement(new DrawableTestHit(new Hit())
+            var h = new DrawableTestHit(new Hit())
             {
                 X = RNG.NextSingle(hitResult == TaikoHitResult.Good ? -0.1f : -0.05f, hitResult == TaikoHitResult.Good ? 0.1f : 0.05f),
                 Judgement = new TaikoJudgement
                 {
                     Result = HitResult.Hit,
                     TaikoResult = hitResult,
-                    TimeOffset = 0,
-                    SecondHit = RNG.Next(10) == 0
+                    TimeOffset = 0
                 }
-            });
+            };
+
+            playfield.OnJudgement(h);
+
+            if (RNG.Next(10) == 0)
+            {
+                h.Judgement.SecondHit = true;
+                playfield.OnJudgement(h);
+            }
         }
 
         private void addMissJudgement()
@@ -73,26 +138,53 @@ namespace osu.Desktop.VisualTests.Tests
             });
         }
 
-        private void addSwell()
+        private void addBarLine(bool major, double delay = scroll_time)
+        {
+            BarLine bl = new BarLine
+            {
+                StartTime = playfield.Time.Current + delay,
+                ScrollTime = scroll_time
+            };
+
+            playfield.AddBarLine(major ? new DrawableBarLineMajor(bl) : new DrawableBarLine(bl));
+        }
+
+        private void addSwell(double duration = default_duration)
         {
             playfield.Add(new DrawableSwell(new Swell
             {
-                StartTime = Time.Current + 1000,
-                EndTime = Time.Current + 5000,
-                PreEmpt = 1000
+                StartTime = playfield.Time.Current + scroll_time,
+                Duration = duration,
+                ScrollTime = scroll_time
             }));
         }
 
+        private void addDrumRoll(bool strong, double duration = default_duration)
+        {
+            addBarLine(true);
+            addBarLine(true, scroll_time + duration);
+
+            var d = new DrumRoll
+            {
+                StartTime = playfield.Time.Current + scroll_time,
+                IsStrong = strong,
+                Duration = duration,
+                ScrollTime = scroll_time,
+            };
+
+            playfield.Add(new DrawableDrumRoll(d));
+        }
+
         private void addCentreHit(bool strong)
         {
             Hit h = new Hit
             {
-                StartTime = Time.Current + 1000,
-                PreEmpt = 1000
+                StartTime = playfield.Time.Current + scroll_time,
+                ScrollTime = scroll_time
             };
 
             if (strong)
-                playfield.Add(new DrawableStrongCentreHit(h));
+                playfield.Add(new DrawableCentreHitStrong(h));
             else
                 playfield.Add(new DrawableCentreHit(h));
         }
@@ -101,12 +193,12 @@ namespace osu.Desktop.VisualTests.Tests
         {
             Hit h = new Hit
             {
-                StartTime = Time.Current + 1000,
-                PreEmpt = 1000
+                StartTime = playfield.Time.Current + scroll_time,
+                ScrollTime = scroll_time
             };
 
             if (strong)
-                playfield.Add(new DrawableStrongRimHit(h));
+                playfield.Add(new DrawableRimHitStrong(h));
             else
                 playfield.Add(new DrawableRimHit(h));
         }

osu.Desktop.VisualTests/VisualTestGame.cs

@@ -14,7 +14,7 @@ namespace osu.Desktop.VisualTests
         {
             base.LoadComplete();
 
-            new BackgroundScreenDefault { Depth = 10 }.LoadAsync(this, AddInternal);
+            LoadComponentAsync(new BackgroundScreenDefault { Depth = 10 }, AddInternal);
 
             // Have to construct this here, rather than in the constructor, because
             // we depend on some dependencies to be loaded within OsuGameBase.load().

osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj

@@ -83,22 +83,20 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="mscorlib" />
-    <Reference Include="OpenTK, Version=2.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\ppy.OpenTK.2.0.50727.1340\lib\net45\OpenTK.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="SharpCompress, Version=0.15.1.0, Culture=neutral, PublicKeyToken=afb0a02973931d96, processorArchitecture=MSIL">
-      <HintPath>..\packages\SharpCompress.0.15.1\lib\net45\SharpCompress.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="OpenTK, Version=2.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\ppy.OpenTK.2.0.50727.1341\lib\net45\OpenTK.dll</HintPath>
+    </Reference>
+    <Reference Include="SharpCompress, Version=0.15.2.0, Culture=neutral, PublicKeyToken=afb0a02973931d96, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\SharpCompress.0.15.2\lib\net45\SharpCompress.dll</HintPath>
     </Reference>
     <Reference Include="SQLite.Net, Version=3.1.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>$(SolutionDir)\packages\SQLite.Net.Core-PCL.3.1.1\lib\portable-win8+net45+wp8+wpa81+MonoAndroid1+MonoTouch1\SQLite.Net.dll</HintPath>
     </Reference>
     <Reference Include="System" />
-    <Reference Include="Newtonsoft.Json">
-      <HintPath>$(SolutionDir)\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
     <Reference Include="SQLiteNetExtensions">
       <HintPath>$(SolutionDir)\packages\SQLiteNetExtensions.1.3.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\SQLiteNetExtensions.dll</HintPath>
     </Reference>
@@ -187,8 +185,11 @@
     <Compile Include="AutomatedVisualTestGame.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Tests\TestCaseChatDisplay.cs" />
+    <Compile Include="Tests\TestCaseBeatmapDetails.cs" />
     <Compile Include="Tests\TestCaseDrawings.cs" />
     <Compile Include="Tests\TestCaseGamefield.cs" />
+    <Compile Include="Tests\TestCaseGraph.cs" />
+    <Compile Include="Tests\TestCaseMenuOverlays.cs" />
     <Compile Include="Tests\TestCaseMusicController.cs" />
     <Compile Include="Tests\TestCaseNotificationManager.cs" />
     <Compile Include="Tests\TestCasePlayer.cs" />
@@ -207,7 +208,6 @@
     <Compile Include="VisualTestGame.cs" />
     <Compile Include="Platform\TestStorage.cs" />
     <Compile Include="Tests\TestCaseOptions.cs" />
-    <Compile Include="Tests\TestCasePauseOverlay.cs" />
     <Compile Include="Tests\TestCaseModSelectOverlay.cs" />
     <Compile Include="Tests\TestCaseDialogOverlay.cs" />
     <Compile Include="Tests\TestCaseBeatmapOptionsOverlay.cs" />

osu.Desktop.VisualTests/packages.config

@@ -4,9 +4,9 @@ Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 -->
 <packages>
-  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
-  <package id="ppy.OpenTK" version="2.0.50727.1340" targetFramework="net45" />
-  <package id="SharpCompress" version="0.15.1" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="10.0.2" targetFramework="net45" />
+  <package id="ppy.OpenTK" version="2.0.50727.1341" targetFramework="net45" />
+  <package id="SharpCompress" version="0.15.2" targetFramework="net45" />
   <package id="SQLite.Net.Core-PCL" version="3.1.1" targetFramework="net45" />
   <package id="SQLite.Net-PCL" version="3.1.1" targetFramework="net45" />
   <package id="SQLiteNetExtensions" version="1.3.0" targetFramework="net45" />