Merge pull request #1314 from peppy/fix-invisible-marker

Editor timeline fixes

osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/BookmarkPart.cs

@@ -15,6 +15,7 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
     {
         protected override void LoadBeatmap(WorkingBeatmap beatmap)
         {
+            base.LoadBeatmap(beatmap);
             foreach (int bookmark in beatmap.BeatmapInfo.Bookmarks)
                 Add(new BookmarkVisualisation(bookmark));
         }

osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/BreakPart.cs

@@ -16,6 +16,7 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
     {
         protected override void LoadBeatmap(WorkingBeatmap beatmap)
         {
+            base.LoadBeatmap(beatmap);
             foreach (var breakPeriod in beatmap.Beatmap.Breaks)
                 Add(new BreakVisualisation(breakPeriod));
         }

osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/ControlPointPart.cs

@@ -18,6 +18,8 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
     {
         protected override void LoadBeatmap(WorkingBeatmap beatmap)
         {
+            base.LoadBeatmap(beatmap);
+
             ControlPointInfo cpi = beatmap.Beatmap.ControlPointInfo;
 
             cpi.TimingPoints.ForEach(addTimingPoint);

osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/MarkerPart.cs

@@ -7,6 +7,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input;
+using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 
 namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
@@ -23,12 +24,6 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
             Add(marker = new MarkerVisualisation());
         }
 
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
-        {
-            marker.Colour = colours.Red;
-        }
-
         protected override bool OnDragStart(InputState state) => true;
         protected override bool OnDragEnd(InputState state) => true;
         protected override bool OnDrag(InputState state)
@@ -61,10 +56,14 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
         protected override void Update()
         {
             base.Update();
-
             marker.X = (float)(Beatmap.Value?.Track.CurrentTime ?? 0);
         }
 
+        protected override void LoadBeatmap(WorkingBeatmap beatmap)
+        {
+            // block base call so we don't clear our marker (can be reused on beatmap change).
+        }
+
         private class MarkerVisualisation : CompositeDrawable
         {
             public MarkerVisualisation()

osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/TimelinePart.cs

@@ -25,16 +25,29 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
 
             Beatmap.ValueChanged += b =>
             {
-                timeline.Clear();
+                updateRelativeChildSize();
-                timeline.RelativeChildSize = new Vector2((float)Math.Max(1, b.Track.Length), 1);
                 LoadBeatmap(b);
             };
         }
 
+        private void updateRelativeChildSize()
+        {
+            // the track may not be loaded completely (only has a length once it is).
+            if (!Beatmap.Value.Track.IsLoaded)
+            {
+                timeline.RelativeChildSize = Vector2.One;
+                Schedule(updateRelativeChildSize);
+                return;
+            }
+
+            timeline.RelativeChildSize = new Vector2((float)Math.Max(1, Beatmap.Value.Track.Length), 1);
+        }
+
         protected void Add(Drawable visualisation) => timeline.Add(visualisation);
 
         protected virtual void LoadBeatmap(WorkingBeatmap beatmap)
         {
+            timeline.Clear();
         }
     }
 }