From ec249a0edbf40c694f905539ddf03691a463d222 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Apr 2021 16:10:37 +0900
Subject: [PATCH] Add new display for sample row attribute

---
 .../Screens/Edit/Timing/ControlPointTable.cs  |  2 +-
 .../RowAttributes/SampleRowAttribute.cs       | 61 +++++++++++++++++++
 2 files changed, 62 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game/Screens/Edit/Timing/RowAttributes/SampleRowAttribute.cs

diff --git a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
index f71f31acb7..17aa5bbefa 100644
--- a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
+++ b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
@@ -147,7 +147,7 @@ namespace osu.Game.Screens.Edit.Timing
                         ).Trim(), colour);
 
                     case SampleControlPoint sample:
-                        return new EmptyRowAttribute("sample", () => $"{sample.SampleBank} {sample.SampleVolume}%", colour);
+                        return new SampleRowAttribute(sample);
                 }
 
                 return null;
diff --git a/osu.Game/Screens/Edit/Timing/RowAttributes/SampleRowAttribute.cs b/osu.Game/Screens/Edit/Timing/RowAttributes/SampleRowAttribute.cs
new file mode 100644
index 0000000000..066b180423
--- /dev/null
+++ b/osu.Game/Screens/Edit/Timing/RowAttributes/SampleRowAttribute.cs
@@ -0,0 +1,61 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+
+namespace osu.Game.Screens.Edit.Timing.RowAttributes
+{
+    public class SampleRowAttribute : RowAttribute
+    {
+        private AttributeBubbledWord sampleText;
+        private OsuSpriteText volumeText;
+
+        private readonly Bindable<string> sampleBank;
+        private readonly BindableNumber<int> volume;
+
+        public SampleRowAttribute(SampleControlPoint sample)
+            : base(sample, "sample")
+        {
+            sampleBank = sample.SampleBankBindable.GetBoundCopy();
+            volume = sample.SampleVolumeBindable.GetBoundCopy();
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            AttributeProgressBar progress;
+
+            Content.AddRange(new Drawable[]
+            {
+                volumeText = new OsuSpriteText
+                {
+                    Anchor = Anchor.CentreLeft,
+                    Origin = Anchor.CentreLeft,
+                    Width = 30,
+                    Font = OsuFont.GetFont(size: EditorTable.TEXT_SIZE, weight: FontWeight.Regular),
+                },
+                progress = new AttributeProgressBar(Point),
+                sampleText = new AttributeBubbledWord(Point),
+            });
+
+            volume.BindValueChanged(vol =>
+            {
+                progress.Current.Value = vol.NewValue / 100f;
+                updateText();
+            }, true);
+
+            sampleBank.BindValueChanged(_ => updateText(), true);
+        }
+
+        private void updateText()
+        {
+            volumeText.Text = $"{volume.Value}%";
+            sampleText.Text = $"{sampleBank.Value}";
+        }
+    }
+}