Merge branch 'master' into fix-song-select-weirdness

osu.Game.Rulesets.Catch.Tests/osu.Game.Rulesets.Catch.Tests.csproj

@@ -2,7 +2,7 @@
   <Import Project="..\osu.TestProject.props" />
   <ItemGroup Label="Package References">
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />

osu.Game.Rulesets.Mania.Tests/osu.Game.Rulesets.Mania.Tests.csproj

@@ -2,7 +2,7 @@
   <Import Project="..\osu.TestProject.props" />
   <ItemGroup Label="Package References">
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />

osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs

@@ -56,7 +56,7 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
 
         protected override void OnMouseUp(MouseUpEvent e)
         {
-            EndPlacement();
+            EndPlacement(true);
             base.OnMouseUp(e);
         }
 

osu.Game.Rulesets.Osu.Tests/osu.Game.Rulesets.Osu.Tests.csproj

@@ -2,7 +2,7 @@
   <Import Project="..\osu.TestProject.props" />
   <ItemGroup Label="Package References">
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />

osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCirclePlacementBlueprint.cs

@@ -30,12 +30,13 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles
 
         protected override bool OnClick(ClickEvent e)
         {
-            EndPlacement();
+            EndPlacement(true);
             return true;
         }
 
         public override void UpdatePosition(Vector2 screenSpacePosition)
         {
+            BeginPlacement();
             HitObject.Position = ToLocalSpace(screenSpacePosition);
         }
     }

osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs

@@ -68,6 +68,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
             switch (state)
             {
                 case PlacementState.Initial:
+                    BeginPlacement();
                     HitObject.Position = ToLocalSpace(screenSpacePosition);
                     break;
 
@@ -132,7 +133,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
         private void endCurve()
         {
             updateSlider();
-            EndPlacement();
+            EndPlacement(true);
         }
 
         protected override void Update()

osu.Game.Rulesets.Osu/Edit/Blueprints/Spinners/SpinnerPlacementBlueprint.cs

@@ -45,7 +45,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Spinners
                     return false;
 
                 HitObject.EndTime = EditorClock.CurrentTime;
-                EndPlacement();
+                EndPlacement(true);
             }
             else
             {

osu.Game.Rulesets.Taiko.Tests/osu.Game.Rulesets.Taiko.Tests.csproj

@@ -2,7 +2,7 @@
   <Import Project="..\osu.TestProject.props" />
   <ItemGroup Label="Package References">
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />

osu.Game.Tests/osu.Game.Tests.csproj

@@ -3,7 +3,7 @@
   <ItemGroup Label="Package References">
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
     <PackageReference Include="DeepEqual" Version="2.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />

osu.Game.Tournament.Tests/osu.Game.Tournament.Tests.csproj

@@ -5,7 +5,7 @@
   </PropertyGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
   </ItemGroup>

osu.Game/OsuGame.cs

@@ -446,7 +446,7 @@ namespace osu.Game
         /// </summary>
         /// <param name="action">The action to perform once we are in the correct state.</param>
         /// <param name="validScreens">An optional collection of valid screen types. If any of these screens are already current we can perform the action immediately, else the first valid parent will be made current before performing the action. <see cref="MainMenu"/> is used if not specified.</param>
-        protected void PerformFromScreen(Action<IScreen> action, IEnumerable<Type> validScreens = null)
+        public void PerformFromScreen(Action<IScreen> action, IEnumerable<Type> validScreens = null)
         {
             performFromMainMenuTask?.Cancel();
 

osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs

@@ -118,27 +118,43 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
             {
                 AutoSizeAxes = Axes.Both;
 
-                InternalChild = new FillFlowContainer
+                InternalChild = new GridContainer
                 {
                     AutoSizeAxes = Axes.Both,
-                    Direction = FillDirection.Vertical,
+                    ColumnDimensions = new[]
-                    Spacing = new Vector2(0, 1),
+                    {
-                    Children = new[]
+                        new Dimension(GridSizeMode.AutoSize, minSize: minWidth ?? 0)
+                    },
+                    RowDimensions = new[]
+                    {
+                        new Dimension(GridSizeMode.AutoSize),
+                        new Dimension(GridSizeMode.Absolute, 4),
+                        new Dimension(GridSizeMode.AutoSize)
+                    },
+                    Content = new[]
+                    {
+                        new Drawable[]
                         {
                             text = new OsuSpriteText
                             {
                                 Font = OsuFont.GetFont(size: 10, weight: FontWeight.Bold),
                                 Text = title.ToUpper()
+                            }
                         },
+                        new Drawable[]
+                        {
                             separator = new Box
                             {
-                            RelativeSizeAxes = minWidth == null ? Axes.X : Axes.None,
+                                Anchor = Anchor.CentreLeft,
-                            Width = minWidth ?? 1f,
+                                RelativeSizeAxes = Axes.X,
-                            Height = 2,
+                                Height = 2
-                            Margin = new MarginPadding { Top = 2 }
+                            }
                         },
+                        new[]
+                        {
                             content
                         }
+                    }
                 };
             }
 

osu.Game/Rulesets/Edit/HitObjectComposer.cs

@@ -251,15 +251,22 @@ namespace osu.Game.Rulesets.Edit
 
         public void BeginPlacement(HitObject hitObject)
         {
+            EditorBeatmap.PlacementObject.Value = hitObject;
+
             if (distanceSnapGrid != null)
                 hitObject.StartTime = GetSnappedPosition(distanceSnapGrid.ToLocalSpace(inputManager.CurrentState.Mouse.Position), hitObject.StartTime).time;
         }
 
-        public void EndPlacement(HitObject hitObject)
+        public void EndPlacement(HitObject hitObject, bool commit)
+        {
+            EditorBeatmap.PlacementObject.Value = null;
+
+            if (commit)
             {
                 EditorBeatmap.Add(hitObject);
 
-            adjustableClock.Seek(hitObject.StartTime);
+                adjustableClock.Seek(hitObject.GetEndTime());
+            }
 
             showGridFor(Enumerable.Empty<HitObject>());
         }

osu.Game/Rulesets/Edit/PlacementBlueprint.cs

@@ -103,11 +103,12 @@ namespace osu.Game.Rulesets.Edit
         /// Signals that the placement of <see cref="HitObject"/> has finished.
         /// This will destroy this <see cref="PlacementBlueprint"/>, and add the <see cref="HitObject"/> to the <see cref="Beatmap"/>.
         /// </summary>
-        protected void EndPlacement()
+        /// <param name="commit">Whether the object should be committed.</param>
+        public void EndPlacement(bool commit)
         {
             if (!PlacementBegun)
                 BeginPlacement();
-            placementHandler.EndPlacement(HitObject);
+            placementHandler.EndPlacement(HitObject, commit);
         }
 
         /// <summary>

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

@@ -32,7 +32,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         protected DragBox DragBox { get; private set; }
 
-        private Container<SelectionBlueprint> selectionBlueprints;
+        protected Container<SelectionBlueprint> SelectionBlueprints { get; private set; }
 
         private SelectionHandler selectionHandler;
 
@@ -62,7 +62,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             {
                 DragBox = CreateDragBox(select),
                 selectionHandler,
-                selectionBlueprints = CreateSelectionBlueprintContainer(),
+                SelectionBlueprints = CreateSelectionBlueprintContainer(),
                 DragBox.CreateProxy().With(p => p.Depth = float.MinValue)
             });
 
@@ -73,7 +73,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             selectedHitObjects.ItemsAdded += objects =>
             {
                 foreach (var o in objects)
-                    selectionBlueprints.FirstOrDefault(b => b.HitObject == o)?.Select();
+                    SelectionBlueprints.FirstOrDefault(b => b.HitObject == o)?.Select();
 
                 SelectionChanged?.Invoke(selectedHitObjects);
             };
@@ -81,7 +81,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             selectedHitObjects.ItemsRemoved += objects =>
             {
                 foreach (var o in objects)
-                    selectionBlueprints.FirstOrDefault(b => b.HitObject == o)?.Deselect();
+                    SelectionBlueprints.FirstOrDefault(b => b.HitObject == o)?.Deselect();
 
                 SelectionChanged?.Invoke(selectedHitObjects);
             };
@@ -230,7 +230,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         private void removeBlueprintFor(HitObject hitObject)
         {
-            var blueprint = selectionBlueprints.SingleOrDefault(m => m.HitObject == hitObject);
+            var blueprint = SelectionBlueprints.SingleOrDefault(m => m.HitObject == hitObject);
             if (blueprint == null)
                 return;
 
@@ -239,7 +239,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             blueprint.Selected -= onBlueprintSelected;
             blueprint.Deselected -= onBlueprintDeselected;
 
-            selectionBlueprints.Remove(blueprint);
+            SelectionBlueprints.Remove(blueprint);
         }
 
         protected virtual void AddBlueprintFor(HitObject hitObject)
@@ -251,7 +251,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             blueprint.Selected += onBlueprintSelected;
             blueprint.Deselected += onBlueprintDeselected;
 
-            selectionBlueprints.Add(blueprint);
+            SelectionBlueprints.Add(blueprint);
         }
 
         #endregion
@@ -278,7 +278,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             if (!allowDeselection && selectionHandler.SelectedBlueprints.Any(s => s.IsHovered))
                 return;
 
-            foreach (SelectionBlueprint blueprint in selectionBlueprints.AliveChildren)
+            foreach (SelectionBlueprint blueprint in SelectionBlueprints.AliveChildren)
             {
                 if (blueprint.IsHovered)
                 {
@@ -308,7 +308,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <param name="rect">The rectangle to perform a selection on in screen-space coordinates.</param>
         private void select(RectangleF rect)
         {
-            foreach (var blueprint in selectionBlueprints)
+            foreach (var blueprint in SelectionBlueprints)
             {
                 if (blueprint.IsAlive && blueprint.IsPresent && rect.Contains(blueprint.SelectionPoint))
                     blueprint.Select();
@@ -322,7 +322,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// </summary>
         private void selectAll()
         {
-            selectionBlueprints.ToList().ForEach(m => m.Select());
+            SelectionBlueprints.ToList().ForEach(m => m.Select());
             selectionHandler.UpdateVisibility();
         }
 
@@ -334,14 +334,14 @@ namespace osu.Game.Screens.Edit.Compose.Components
         private void onBlueprintSelected(SelectionBlueprint blueprint)
         {
             selectionHandler.HandleSelected(blueprint);
-            selectionBlueprints.ChangeChildDepth(blueprint, 1);
+            SelectionBlueprints.ChangeChildDepth(blueprint, 1);
             beatmap.SelectedHitObjects.Add(blueprint.HitObject);
         }
 
         private void onBlueprintDeselected(SelectionBlueprint blueprint)
         {
             selectionHandler.HandleDeselected(blueprint);
-            selectionBlueprints.ChangeChildDepth(blueprint, 0);
+            SelectionBlueprints.ChangeChildDepth(blueprint, 0);
             beatmap.SelectedHitObjects.Remove(blueprint.HitObject);
         }
 

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

@@ -63,6 +63,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
         private void refreshTool()
         {
             placementBlueprintContainer.Clear();
+
+            currentPlacement?.EndPlacement(false);
             currentPlacement = null;
 
             var blueprint = CurrentTool?.CreatePlacementBlueprint();

osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs

@@ -3,6 +3,7 @@
 
 using System;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
@@ -21,8 +22,15 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         [Resolved(CanBeNull = true)]
         private Timeline timeline { get; set; }
 
+        [Resolved]
+        private EditorBeatmap beatmap { get; set; }
+
         private DragEvent lastDragEvent;
 
+        private Bindable<HitObject> placement;
+
+        private SelectionBlueprint placementBlueprint;
+
         public TimelineBlueprintContainer()
         {
             RelativeSizeAxes = Axes.Both;
@@ -43,6 +51,29 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         {
             base.LoadComplete();
             DragBox.Alpha = 0;
+
+            placement = beatmap.PlacementObject.GetBoundCopy();
+            placement.ValueChanged += placementChanged;
+        }
+
+        private void placementChanged(ValueChangedEvent<HitObject> obj)
+        {
+            if (obj.NewValue == null)
+            {
+                if (placementBlueprint != null)
+                {
+                    SelectionBlueprints.Remove(placementBlueprint);
+                    placementBlueprint = null;
+                }
+            }
+            else
+            {
+                placementBlueprint = CreateBlueprintFor(obj.NewValue);
+
+                placementBlueprint.Colour = Color4.MediumPurple;
+
+                SelectionBlueprints.Add(placementBlueprint);
+            }
         }
 
         protected override Container<SelectionBlueprint> CreateSelectionBlueprintContainer() => new TimelineSelectionBlueprintContainer { RelativeSizeAxes = Axes.Both };

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

@@ -17,7 +17,8 @@ namespace osu.Game.Screens.Edit.Compose
         /// Notifies that a placement has finished.
         /// </summary>
         /// <param name="hitObject">The <see cref="HitObject"/> that has been placed.</param>
-        void EndPlacement(HitObject hitObject);
+        /// <param name="commit">Whether the object should be committed.</param>
+        void EndPlacement(HitObject hitObject, bool commit);
 
         /// <summary>
         /// Deletes a <see cref="HitObject"/>.

osu.Game/Screens/Edit/EditorBeatmap.cs

@@ -33,7 +33,15 @@ namespace osu.Game.Screens.Edit
         /// </summary>
         public event Action<HitObject> StartTimeChanged;
 
-        public BindableList<HitObject> SelectedHitObjects { get; } = new BindableList<HitObject>();
+        /// <summary>
+        /// All currently selected <see cref="HitObject"/>s.
+        /// </summary>
+        public readonly BindableList<HitObject> SelectedHitObjects = new BindableList<HitObject>();
+
+        /// <summary>
+        /// The current placement. Null if there's no active placement.
+        /// </summary>
+        public readonly Bindable<HitObject> PlacementObject = new Bindable<HitObject>();
 
         public readonly IBeatmap PlayableBeatmap;
 

osu.Game/Screens/Menu/MainMenu.cs

@@ -141,12 +141,15 @@ namespace osu.Game.Screens.Menu
             preloadSongSelect();
         }
 
+        [Resolved]
+        private OsuGame game { get; set; }
+
         private void confirmAndExit()
         {
             if (exitConfirmed) return;
 
             exitConfirmed = true;
-            this.Exit();
+            game.PerformFromScreen(menu => menu.Exit());
         }
 
         private void preloadSongSelect()

osu.Game/Tests/Visual/PlacementBlueprintTestScene.cs

@@ -53,8 +53,9 @@ namespace osu.Game.Tests.Visual
         {
         }
 
-        public void EndPlacement(HitObject hitObject)
+        public void EndPlacement(HitObject hitObject, bool commit)
         {
+            if (commit)
                 AddHitObject(CreateHitObject(hitObject));
 
             Remove(currentBlueprint);

osu.Game/osu.Game.csproj

@@ -24,7 +24,7 @@
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2019.1230.0" />
     <PackageReference Include="ppy.osu.Framework" Version="2020.207.0" />
-    <PackageReference Include="Sentry" Version="2.0.1" />
+    <PackageReference Include="Sentry" Version="2.0.2" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />