Merge branch 'master' into fix-info-wedge

osu.Game/Screens/Edit/Components/BottomBarContainer.cs

@@ -0,0 +1,50 @@
+// 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.Allocation;
+using osu.Framework.Audio.Track;
+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;
+
+namespace osu.Game.Screens.Edit.Components
+{
+    public class BottomBarContainer : Container
+    {
+        private const float corner_radius = 5;
+        private const float contents_padding = 15;
+
+        public Bindable<WorkingBeatmap> Beatmap = new Bindable<WorkingBeatmap>();
+        protected Track Track => Beatmap.Value.Track;
+
+        private readonly Drawable background;
+        private readonly Container content;
+
+        protected override Container<Drawable> Content => content;
+
+        public BottomBarContainer()
+        {
+            Masking = true;
+            CornerRadius = corner_radius;
+
+            InternalChildren = new[]
+            {
+                background = new Box { RelativeSizeAxes = Axes.Both },
+                content = new Container
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Padding = new MarginPadding { Horizontal = contents_padding },
+                }
+            };
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            background.Colour = colours.Gray1;
+        }
+    }
+}

osu.Game/Screens/Edit/Components/PlaybackContainer.cs

@@ -0,0 +1,160 @@
+// 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.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Input;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
+
+namespace osu.Game.Screens.Edit.Components
+{
+    public class PlaybackContainer : BottomBarContainer
+    {
+        private readonly IconButton playButton;
+
+        public PlaybackContainer()
+        {
+            PlaybackTabControl tabs;
+
+            Children = new Drawable[]
+            {
+                playButton = new IconButton
+                {
+                    Anchor = Anchor.CentreLeft,
+                    Origin = Anchor.Centre,
+                    Scale = new Vector2(1.4f),
+                    IconScale = new Vector2(1.4f),
+                    Icon = FontAwesome.fa_play_circle_o,
+                    Action = playPause,
+                    Padding = new MarginPadding { Left = 20 }
+                },
+                new OsuSpriteText
+                {
+                    Origin = Anchor.BottomLeft,
+                    Text = "Playback Speed",
+                    RelativePositionAxes = Axes.Y,
+                    Y = 0.5f,
+                    Padding = new MarginPadding { Left = 45 }
+                },
+                new Container
+                {
+                    Anchor = Anchor.BottomLeft,
+                    Origin = Anchor.BottomLeft,
+                    RelativeSizeAxes = Axes.Both,
+                    Height = 0.5f,
+                    Padding = new MarginPadding { Left = 45 },
+                    Child = tabs = new PlaybackTabControl(),
+                }
+            };
+
+            tabs.AddItem(0.25);
+            tabs.AddItem(0.75);
+            tabs.AddItem(1);
+
+            tabs.Current.ValueChanged += newValue => Track.Tempo.Value = newValue;
+        }
+
+        private void playPause()
+        {
+            if (Track.IsRunning)
+                Track.Stop();
+            else
+                Track.Start();
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            playButton.Icon = Track.IsRunning ? FontAwesome.fa_pause_circle_o : FontAwesome.fa_play_circle_o;
+        }
+
+        private class PlaybackTabControl : OsuTabControl<double>
+        {
+            protected override TabItem<double> CreateTabItem(double value) => new PlaybackTabItem(value);
+
+            protected override Dropdown<double> CreateDropdown() => null;
+
+            public PlaybackTabControl()
+            {
+                RelativeSizeAxes = Axes.Both;
+                TabContainer.Spacing = new Vector2(20, 0);
+            }
+
+            public class PlaybackTabItem : TabItem<double>
+            {
+                private const float fade_duration = 100;
+
+                private readonly OsuSpriteText text;
+                private readonly OsuSpriteText textBold;
+
+                public PlaybackTabItem(double value) : base(value)
+                {
+                    AutoSizeAxes = Axes.X;
+                    RelativeSizeAxes = Axes.Y;
+
+                    Children = new Drawable[]
+                    {
+                        text = new OsuSpriteText
+                        {
+                            Origin = Anchor.TopCentre,
+                            Anchor = Anchor.TopCentre,
+                            Text = $"{value:P0}",
+                            TextSize = 14,
+                        },
+                        textBold = new OsuSpriteText
+                        {
+                            Origin = Anchor.TopCentre,
+                            Anchor = Anchor.TopCentre,
+                            Text = $"{value:P0}",
+                            TextSize = 14,
+                            Font = @"Exo2.0-Bold",
+                            Alpha = 0,
+                            AlwaysPresent = true,
+                        },
+                    };
+                }
+
+                [BackgroundDependencyLoader]
+                private void load(OsuColour colours)
+                {
+                    text.Colour = colours.Gray5;
+                }
+
+                protected override bool OnHover(InputState state)
+                {
+                    if (!Active)
+                        toBold();
+                    return true;
+                }
+
+                protected override void OnHoverLost(InputState state)
+                {
+                    if (!Active)
+                        toNormal();
+                }
+
+                private void toBold()
+                {
+                    text.FadeOut(fade_duration);
+                    textBold.FadeIn(fade_duration);
+                }
+
+                private void toNormal()
+                {
+                    text.FadeIn(fade_duration);
+                    textBold.FadeOut(fade_duration);
+                }
+
+                protected override void OnActivated() => toBold();
+
+                protected override void OnDeactivated() => toNormal();
+            }
+        }
+    }
+}

osu.Game/Screens/Edit/Components/TimeInfoContainer.cs

@@ -0,0 +1,38 @@
+// 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.Game.Graphics.Sprites;
+using System;
+
+namespace osu.Game.Screens.Edit.Components
+{
+    public class TimeInfoContainer : BottomBarContainer
+    {
+        private const int count_duration = 150;
+
+        private readonly OsuSpriteText trackTimer;
+
+        public TimeInfoContainer()
+        {
+            Children = new Drawable[]
+            {
+                trackTimer = new OsuSpriteText
+                {
+                    Origin = Anchor.BottomLeft,
+                    RelativePositionAxes = Axes.Y,
+                    TextSize = 22,
+                    FixedWidth = true,
+                    Y = 0.5f,
+                }
+            };
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            trackTimer.Text = TimeSpan.FromMilliseconds(Track.CurrentTime).ToString(@"mm\:ss\:fff");
+        }
+    }
+}

osu.Game/Screens/Edit/Components/Timelines/Summary/SummaryTimeline.cs

@@ -3,11 +3,9 @@
 
 using OpenTK;
 using osu.Framework.Allocation;
-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.Screens.Edit.Components.Timelines.Summary.Parts;
 
@@ -16,83 +14,64 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary
     /// <summary>
     /// The timeline that sits at the bottom of the editor.
     /// </summary>
-    public class SummaryTimeline : CompositeDrawable
+    public class SummaryTimeline : BottomBarContainer
     {
-        private const float corner_radius = 5;
-        private const float contents_padding = 15;
-
-        public Bindable<WorkingBeatmap> Beatmap = new Bindable<WorkingBeatmap>();
-
-        private readonly Drawable background;
-
         private readonly Drawable timelineBar;
 
         public SummaryTimeline()
         {
-            Masking = true;
-            CornerRadius = corner_radius;
-
             TimelinePart markerPart, controlPointPart, bookmarkPart, breakPart;
 
-            InternalChildren = new[]
+            Children = new[]
             {
-                background = new Box { RelativeSizeAxes = Axes.Both },
+                markerPart = new MarkerPart { RelativeSizeAxes = Axes.Both },
-                new Container
+                controlPointPart = new ControlPointPart
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.BottomCentre,
+                    RelativeSizeAxes = Axes.Both,
+                    Height = 0.35f
+                },
+                bookmarkPart = new BookmarkPart
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.TopCentre,
+                    RelativeSizeAxes = Axes.Both,
+                    Height = 0.35f
+                },
+                timelineBar = new Container
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Padding = new MarginPadding { Left = contents_padding, Right = contents_padding },
+                    Children = new Drawable[]
-                    Children = new[]
                     {
-                        markerPart = new MarkerPart { RelativeSizeAxes = Axes.Both },
+                        new Circle
-                        controlPointPart = new ControlPointPart
                         {
-                            Anchor = Anchor.Centre,
+                            Anchor = Anchor.CentreLeft,
-                            Origin = Anchor.BottomCentre,
+                            Origin = Anchor.CentreRight,
-                            RelativeSizeAxes = Axes.Both,
+                            Size = new Vector2(5)
-                            Height = 0.35f
                         },
-                        bookmarkPart = new BookmarkPart
+                        new Box
                         {
-                            Anchor = Anchor.Centre,
+                            Anchor = Anchor.CentreLeft,
-                            Origin = Anchor.TopCentre,
+                            Origin = Anchor.CentreLeft,
-                            RelativeSizeAxes = Axes.Both,
+                            RelativeSizeAxes = Axes.X,
-                            Height = 0.35f
+                            Height = 1,
+                            EdgeSmoothness = new Vector2(0, 1),
                         },
-                        timelineBar = new Container
+                        new Circle
                         {
-                            RelativeSizeAxes = Axes.Both,
+                            Anchor = Anchor.CentreRight,
-                            Children = new Drawable[]
+                            Origin = Anchor.CentreLeft,
-                            {
+                            Size = new Vector2(5)
-                                new Circle
-                                {
-                                    Anchor = Anchor.CentreLeft,
-                                    Origin = Anchor.CentreRight,
-                                    Size = new Vector2(5)
-                                },
-                                new Box
-                                {
-                                    Anchor = Anchor.CentreLeft,
-                                    Origin = Anchor.CentreLeft,
-                                    RelativeSizeAxes = Axes.X,
-                                    Height = 1,
-                                    EdgeSmoothness = new Vector2(0, 1),
-                                },
-                                new Circle
-                                {
-                                    Anchor = Anchor.CentreRight,
-                                    Origin = Anchor.CentreLeft,
-                                    Size = new Vector2(5)
-                                },
-                            }
                         },
-                        breakPart = new BreakPart
-                        {
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                            RelativeSizeAxes = Axes.Both,
-                            Height = 0.25f
-                        }
                     }
+                },
+                breakPart = new BreakPart
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    RelativeSizeAxes = Axes.Both,
+                    Height = 0.25f
                 }
             };
 
@@ -105,7 +84,6 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            background.Colour = colours.Gray1;
             timelineBar.Colour = colours.Gray5;
         }
     }

osu.Game/Screens/Edit/Editor.cs

@@ -10,13 +10,13 @@ using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
 using osu.Game.Screens.Edit.Menus;
 using osu.Game.Screens.Edit.Components.Timelines.Summary;
-using OpenTK;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Screens.Edit.Screens;
 using osu.Game.Screens.Edit.Screens.Compose;
 using osu.Game.Screens.Edit.Screens.Design;
+using osu.Game.Screens.Edit.Components;
 
 namespace osu.Game.Screens.Edit
 {
@@ -34,7 +34,9 @@ namespace osu.Game.Screens.Edit
         public Editor()
         {
             EditorMenuBar menuBar;
+            TimeInfoContainer timeInfo;
             SummaryTimeline timeline;
+            PlaybackContainer playback;
 
             Children = new[]
             {
@@ -84,30 +86,47 @@ namespace osu.Game.Screens.Edit
                         new Container
                         {
                             RelativeSizeAxes = Axes.Both,
-                            Padding = new MarginPadding { Top = 5, Bottom = 5, Left = 10, Right = 10 },
+                            Padding = new MarginPadding { Vertical = 5, Horizontal = 10 },
-                            Child = new FillFlowContainer
+                            Child = new GridContainer
                             {
-                                Name = "Bottom bar",
                                 RelativeSizeAxes = Axes.Both,
-                                Direction = FillDirection.Horizontal,
+                                ColumnDimensions = new[]
-                                Spacing = new Vector2(10, 0),
-                                Children = new[]
                                 {
-                                    timeline = new SummaryTimeline
+                                    new Dimension(GridSizeMode.Absolute, 220),
+                                    new Dimension(),
+                                    new Dimension(GridSizeMode.Absolute, 220)
+                                },
+                                Content = new[]
+                                {
+                                    new Drawable[]
                                     {
-                                        Anchor = Anchor.Centre,
+                                        new Container
-                                        Origin = Anchor.Centre,
+                                        {
-                                        RelativeSizeAxes = Axes.Both,
+                                            RelativeSizeAxes = Axes.Both,
-                                        Width = 0.65f
+                                            Padding = new MarginPadding { Right = 10 },
-                                    }
+                                            Child = timeInfo = new TimeInfoContainer { RelativeSizeAxes = Axes.Both },
+                                        },
+                                        timeline = new SummaryTimeline
+                                        {
+                                            RelativeSizeAxes = Axes.Both,
+                                        },
+                                        new Container
+                                        {
+                                            RelativeSizeAxes = Axes.Both,
+                                            Padding = new MarginPadding { Left = 10 },
+                                            Child = playback = new PlaybackContainer { RelativeSizeAxes = Axes.Both },
+                                        }
+                                    },
                                 }
-                            }
+                            },
                         }
                     }
                 },
             };
 
+            timeInfo.Beatmap.BindTo(Beatmap);
             timeline.Beatmap.BindTo(Beatmap);
+            playback.Beatmap.BindTo(Beatmap);
             menuBar.Mode.ValueChanged += onModeChanged;
         }
 
@@ -154,7 +173,11 @@ namespace osu.Game.Screens.Edit
         protected override bool OnExiting(Screen next)
         {
             Background.FadeColour(Color4.White, 500);
-            Beatmap.Value.Track?.Start();
+            if (Beatmap.Value.Track != null)
+            {
+                Beatmap.Value.Track.Tempo.Value = 1;
+                Beatmap.Value.Track.Start();
+            }
             return base.OnExiting(next);
         }
     }

osu.Game/osu.Game.csproj

@@ -298,6 +298,9 @@
     <Compile Include="Overlays\Profile\Sections\Ranks\DrawableTotalScore.cs" />
     <Compile Include="Overlays\Profile\Sections\Ranks\ScoreModsContainer.cs" />
     <Compile Include="Overlays\Settings\SettingsButton.cs" />
+    <Compile Include="Screens\Edit\Components\BottomBarContainer.cs" />
+    <Compile Include="Screens\Edit\Components\PlaybackContainer.cs" />
+    <Compile Include="Screens\Edit\Components\TimeInfoContainer.cs" />
     <Compile Include="Rulesets\Mods\IApplicableToScoreProcessor.cs" />
     <Compile Include="Screens\Edit\Screens\Compose\Timeline\BeatmapWaveformGraph.cs" />
     <Compile Include="Beatmaps\Drawables\DifficultyColouredContainer.cs" />