Merge remote-tracking branch 'origin/master' into UselessToucan/EfCore

# Conflicts:
#	osu-framework
#	osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
#	osu.Game/Beatmaps/BeatmapInfo.cs
#	osu.Game/Online/API/Requests/GetBeatmapSetsResponse.cs

osu.Game/Screens/Edit/Screens/Compose/Compose.cs

@@ -6,6 +6,7 @@ using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
+using osu.Game.Screens.Edit.Screens.Compose.Timeline;
 
 namespace osu.Game.Screens.Edit.Screens.Compose
 {
@@ -13,6 +14,7 @@ namespace osu.Game.Screens.Edit.Screens.Compose
     {
         public Compose()
         {
+            ScrollableTimeline timeline;
             Children = new[]
             {
                 new Container
@@ -31,11 +33,22 @@ namespace osu.Game.Screens.Edit.Screens.Compose
                         {
                             Name = "Content",
                             RelativeSizeAxes = Axes.Both,
-                            Padding = new MarginPadding { Horizontal = 17, Vertical = 10 }
+                            Padding = new MarginPadding { Horizontal = 17, Vertical = 10 },
+                            Children = new Drawable[]
+                            {
+                                new Container
+                                {
+                                    RelativeSizeAxes = Axes.Both,
+                                    Padding = new MarginPadding { Right = 115 },
+                                    Child = timeline = new ScrollableTimeline { RelativeSizeAxes = Axes.Both }
+                                }
+                            }
                         }
                     }
                 }
             };
+
+            timeline.Beatmap.BindTo(Beatmap);
         }
     }
 }

osu.Game/Screens/Edit/Screens/Compose/Timeline/BeatmapWaveformGraph.cs

@@ -0,0 +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 osu.Framework.Configuration;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Audio;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Beatmaps;
+
+namespace osu.Game.Screens.Edit.Screens.Compose.Timeline
+{
+    public class BeatmapWaveformGraph : CompositeDrawable
+    {
+        public readonly Bindable<WorkingBeatmap> Beatmap = new Bindable<WorkingBeatmap>();
+
+        private readonly WaveformGraph graph;
+
+        public BeatmapWaveformGraph()
+        {
+            InternalChild = graph = new WaveformGraph { RelativeSizeAxes = Axes.Both };
+            Beatmap.ValueChanged += b => graph.Waveform = b.Waveform;
+        }
+
+        /// <summary>
+        /// Gets or sets the <see cref="WaveformGraph.Resolution"/>.
+        /// </summary>
+        public float Resolution
+        {
+            get { return graph.Resolution; }
+            set { graph.Resolution = value; }
+        }
+    }
+}

osu.Game/Screens/Edit/Screens/Compose/Timeline/ScrollableTimeline.cs

@@ -0,0 +1,131 @@
+// 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.Configuration;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Beatmaps;
+using osu.Game.Graphics;
+using osu.Game.Graphics.UserInterface;
+
+namespace osu.Game.Screens.Edit.Screens.Compose.Timeline
+{
+    public class ScrollableTimeline : CompositeDrawable
+    {
+        public readonly Bindable<WorkingBeatmap> Beatmap = new Bindable<WorkingBeatmap>();
+
+        private readonly ScrollingTimelineContainer timelineContainer;
+
+        public ScrollableTimeline()
+        {
+            Masking = true;
+            CornerRadius = 5;
+
+            OsuCheckbox hitObjectsCheckbox;
+            OsuCheckbox hitSoundsCheckbox;
+            OsuCheckbox waveformCheckbox;
+            InternalChildren = new Drawable[]
+            {
+                new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = OsuColour.FromHex("111")
+                },
+                new FillFlowContainer
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Direction = FillDirection.Horizontal,
+                    Children = new Drawable[]
+                    {
+                        new Container
+                        {
+                            AutoSizeAxes = Axes.X,
+                            RelativeSizeAxes = Axes.Y,
+                            Children = new Drawable[]
+                            {
+                                new Box
+                                {
+                                    RelativeSizeAxes = Axes.Both,
+                                    Colour = OsuColour.FromHex("222")
+                                },
+                                new FillFlowContainer
+                                {
+                                    Anchor = Anchor.CentreLeft,
+                                    Origin = Anchor.CentreLeft,
+                                    AutoSizeAxes = Axes.Y,
+                                    Width = 160,
+                                    Padding = new MarginPadding { Horizontal = 15 },
+                                    Direction = FillDirection.Vertical,
+                                    Spacing = new Vector2(0, 4),
+                                    Children = new[]
+                                    {
+                                        hitObjectsCheckbox = new OsuCheckbox { LabelText = "Hitobjects" },
+                                        hitSoundsCheckbox = new OsuCheckbox { LabelText = "Hitsounds" },
+                                        waveformCheckbox = new OsuCheckbox { LabelText = "Waveform" }
+                                    }
+                                }
+                            }
+                        },
+                        new Container
+                        {
+                            AutoSizeAxes = Axes.X,
+                            RelativeSizeAxes = Axes.Y,
+                            Children = new Drawable[]
+                            {
+                                new Box
+                                {
+                                    RelativeSizeAxes = Axes.Both,
+                                    Colour = OsuColour.FromHex("333")
+                                },
+                                new Container<TimelineButton>
+                                {
+                                    Anchor = Anchor.CentreLeft,
+                                    Origin = Anchor.CentreLeft,
+                                    RelativeSizeAxes = Axes.Y,
+                                    AutoSizeAxes = Axes.X,
+                                    Masking = true,
+                                    Children = new[]
+                                    {
+                                        new TimelineButton
+                                        {
+                                            RelativeSizeAxes = Axes.Y,
+                                            Height = 0.5f,
+                                            Icon = FontAwesome.fa_search_plus,
+                                            Action = () => timelineContainer.Zoom++
+                                        },
+                                        new TimelineButton
+                                        {
+                                            Anchor = Anchor.BottomLeft,
+                                            Origin = Anchor.BottomLeft,
+                                            RelativeSizeAxes = Axes.Y,
+                                            Height = 0.5f,
+                                            Icon = FontAwesome.fa_search_minus,
+                                            Action = () => timelineContainer.Zoom--
+                                        },
+                                    }
+                                }
+                            }
+                        },
+                        timelineContainer = new ScrollingTimelineContainer { RelativeSizeAxes = Axes.Y }
+                    }
+                }
+            };
+
+            hitObjectsCheckbox.Current.Value = true;
+            hitSoundsCheckbox.Current.Value = true;
+            waveformCheckbox.Current.Value = true;
+
+            timelineContainer.Beatmap.BindTo(Beatmap);
+            timelineContainer.WaveformVisible.BindTo(waveformCheckbox.Current);
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            timelineContainer.Size = new Vector2(DrawSize.X - timelineContainer.DrawPosition.X, 1);
+        }
+    }
+}

osu.Game/Screens/Edit/Screens/Compose/Timeline/ScrollingTimelineContainer.cs

@@ -0,0 +1,141 @@
+// 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;
+using OpenTK;
+using osu.Framework.Configuration;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Input;
+using osu.Game.Beatmaps;
+using osu.Game.Graphics;
+
+namespace osu.Game.Screens.Edit.Screens.Compose.Timeline
+{
+    internal class ScrollingTimelineContainer : ScrollContainer
+    {
+        public readonly Bindable<bool> HitObjectsVisible = new Bindable<bool>();
+        public readonly Bindable<bool> HitSoundsVisible = new Bindable<bool>();
+        public readonly Bindable<bool> WaveformVisible = new Bindable<bool>();
+        public readonly Bindable<WorkingBeatmap> Beatmap = new Bindable<WorkingBeatmap>();
+
+        private readonly BeatmapWaveformGraph waveform;
+
+        public ScrollingTimelineContainer()
+            : base(Direction.Horizontal)
+        {
+            Masking = true;
+
+            Add(waveform = new BeatmapWaveformGraph
+            {
+                RelativeSizeAxes = Axes.Both,
+                Colour = OsuColour.FromHex("222"),
+                Depth = float.MaxValue
+            });
+
+            Content.AutoSizeAxes = Axes.None;
+            Content.RelativeSizeAxes = Axes.Both;
+
+            waveform.Beatmap.BindTo(Beatmap);
+            WaveformVisible.ValueChanged += waveformVisibilityChanged;
+
+            Zoom = 10;
+        }
+
+        private float minZoom = 1;
+        /// <summary>
+        /// The minimum zoom level allowed.
+        /// </summary>
+        public float MinZoom
+        {
+            get { return minZoom; }
+            set
+            {
+                if (value <= 0)
+                    throw new ArgumentOutOfRangeException(nameof(value));
+                if (minZoom == value)
+                    return;
+                minZoom = value;
+
+                // Update the zoom level
+                Zoom = Zoom;
+            }
+        }
+
+        private float maxZoom = 30;
+        /// <summary>
+        /// The maximum zoom level allowed.
+        /// </summary>
+        public float MaxZoom
+        {
+            get { return maxZoom; }
+            set
+            {
+                if (value <= 0)
+                    throw new ArgumentOutOfRangeException(nameof(value));
+                if (maxZoom == value)
+                    return;
+                maxZoom = value;
+
+                // Update the zoom level
+                Zoom = Zoom;
+            }
+        }
+
+        private float zoom = 1;
+        /// <summary>
+        /// The current zoom level.
+        /// </summary>
+        public float Zoom
+        {
+            get { return zoom; }
+            set
+            {
+                value = MathHelper.Clamp(value, MinZoom, MaxZoom);
+                if (zoom == value)
+                    return;
+                zoom = value;
+
+                // Make the zoom target default to the center of the graph if it hasn't been set
+                if (relativeContentZoomTarget == null)
+                    relativeContentZoomTarget = ToSpaceOfOtherDrawable(DrawSize / 2, Content).X / Content.DrawSize.X;
+                if (localZoomTarget == null)
+                    localZoomTarget = DrawSize.X / 2;
+
+                Content.ResizeWidthTo(Zoom);
+
+                // Update the scroll position to focus on the zoom target
+                float scrollPos = Content.DrawSize.X * relativeContentZoomTarget.Value - localZoomTarget.Value;
+                ScrollTo(scrollPos, false);
+
+                relativeContentZoomTarget = null;
+                localZoomTarget = null;
+            }
+        }
+
+        /// <summary>
+        /// Zoom target as a relative position in the <see cref="Content"/> space.
+        /// </summary>
+        private float? relativeContentZoomTarget;
+
+        /// <summary>
+        /// Zoom target as a position in our local space.
+        /// </summary>
+        private float? localZoomTarget;
+
+        protected override bool OnWheel(InputState state)
+        {
+            if (!state.Keyboard.ControlPressed)
+                return base.OnWheel(state);
+
+            relativeContentZoomTarget = Content.ToLocalSpace(state.Mouse.NativeState.Position).X / Content.DrawSize.X;
+            localZoomTarget = ToLocalSpace(state.Mouse.NativeState.Position).X;
+
+            Zoom += state.Mouse.WheelDelta;
+
+            return true;
+        }
+
+        private void waveformVisibilityChanged(bool visible) => waveform.FadeTo(visible ? 1 : 0, 200, Easing.OutQuint);
+    }
+}

osu.Game/Screens/Edit/Screens/Compose/Timeline/TimelineButton.cs

@@ -0,0 +1,52 @@
+// 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;
+using OpenTK;
+using OpenTK.Graphics;
+using osu.Framework.Configuration;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics;
+using osu.Game.Graphics.UserInterface;
+
+namespace osu.Game.Screens.Edit.Screens.Compose.Timeline
+{
+    public class TimelineButton : CompositeDrawable
+    {
+        public Action Action;
+        public readonly BindableBool Enabled = new BindableBool(true);
+
+        public FontAwesome Icon
+        {
+            get { return button.Icon; }
+            set { button.Icon = value; }
+        }
+
+        private readonly IconButton button;
+
+        public TimelineButton()
+        {
+            InternalChild = button = new IconButton
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                IconColour = OsuColour.Gray(0.35f),
+                IconHoverColour = Color4.White,
+                HoverColour = OsuColour.Gray(0.25f),
+                FlashColour = OsuColour.Gray(0.5f),
+                Action = () => Action?.Invoke()
+            };
+
+            button.Enabled.BindTo(Enabled);
+            Width = button.ButtonSize.X;
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            button.ButtonSize = new Vector2(button.ButtonSize.X, DrawHeight);
+        }
+    }
+}