From ea6f257dc213d4ae1430d3a70e6c8edde3a0f4ba Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 17 Jul 2020 17:48:27 +0900
Subject: [PATCH] Add a display of count of selected objects in editor

---
 .../Compose/Components/BlueprintContainer.cs  |  1 +
 .../Compose/Components/SelectionHandler.cs    | 60 ++++++++++++++-----
 2 files changed, 46 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index c6e228262f..33c33267a3 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -64,6 +64,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 DragBox = CreateDragBox(select),
                 selectionHandler,
                 SelectionBlueprints = CreateSelectionBlueprintContainer(),
+                selectionHandler.CreateProxy(),
                 DragBox.CreateProxy().With(p => p.Depth = float.MinValue)
             });
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 38893f90a8..8e7afdaf02 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -15,6 +15,7 @@ using osu.Framework.Input.Bindings;
 using osu.Framework.Input.States;
 using osu.Game.Audio;
 using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects;
@@ -35,7 +36,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         public IEnumerable<HitObject> SelectedHitObjects => selectedBlueprints.Select(b => b.HitObject);
 
-        private Drawable outline;
+        private Drawable content;
+
+        private OsuSpriteText selectionDetailsText;
 
         [Resolved(CanBeNull = true)]
         protected EditorBeatmap EditorBeatmap { get; private set; }
@@ -55,16 +58,41 @@ namespace osu.Game.Screens.Edit.Compose.Components
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            InternalChild = outline = new Container
+            InternalChild = content = new Container
             {
-                Masking = true,
-                BorderThickness = BORDER_RADIUS,
-                BorderColour = colours.Yellow,
-                Child = new Box
+                Children = new Drawable[]
                 {
-                    RelativeSizeAxes = Axes.Both,
-                    AlwaysPresent = true,
-                    Alpha = 0
+                    new Container
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Masking = true,
+                        BorderThickness = BORDER_RADIUS,
+                        BorderColour = colours.Yellow,
+                        Child = new Box
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            AlwaysPresent = true,
+                            Alpha = 0
+                        }
+                    },
+                    new Container
+                    {
+                        Name = "info text",
+                        AutoSizeAxes = Axes.Both,
+                        Children = new Drawable[]
+                        {
+                            new Box
+                            {
+                                Colour = colours.Yellow,
+                                RelativeSizeAxes = Axes.Both,
+                            },
+                            selectionDetailsText = new OsuSpriteText
+                            {
+                                Padding = new MarginPadding(2),
+                                Colour = colours.Gray0,
+                            }
+                        }
+                    }
                 }
             };
         }
@@ -131,9 +159,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             selectedBlueprints.Remove(blueprint);
             EditorBeatmap.SelectedHitObjects.Remove(blueprint.HitObject);
 
-            // We don't want to update visibility if > 0, since we may be deselecting blueprints during drag-selection
-            if (selectedBlueprints.Count == 0)
-                UpdateVisibility();
+            UpdateVisibility();
         }
 
         /// <summary>
@@ -179,7 +205,11 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// </summary>
         internal void UpdateVisibility()
         {
-            if (selectedBlueprints.Count > 0)
+            int count = selectedBlueprints.Count;
+
+            selectionDetailsText.Text = count > 0 ? count.ToString() : string.Empty;
+
+            if (count > 0)
                 Show();
             else
                 Hide();
@@ -205,8 +235,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
             topLeft -= new Vector2(5);
             bottomRight += new Vector2(5);
 
-            outline.Size = bottomRight - topLeft;
-            outline.Position = topLeft;
+            content.Size = bottomRight - topLeft;
+            content.Position = topLeft;
         }
 
         #endregion