From d3cebfb6fb63d0dabd62f695f58ce41e241b5b27 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Mon, 19 Apr 2021 15:27:38 +0900 Subject: [PATCH] Use explicit label --- osu.Game/Screens/Edit/Timing/RowAttribute.cs | 6 ++++-- .../Screens/Edit/Timing/RowAttributes/TimingRowAttribute.cs | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/osu.Game/Screens/Edit/Timing/RowAttribute.cs b/osu.Game/Screens/Edit/Timing/RowAttribute.cs index 55051a1bb2..4cfdeb06c3 100644 --- a/osu.Game/Screens/Edit/Timing/RowAttribute.cs +++ b/osu.Game/Screens/Edit/Timing/RowAttribute.cs @@ -16,12 +16,14 @@ namespace osu.Game.Screens.Edit.Timing public class RowAttribute : CompositeDrawable { private readonly ControlPoint point; + private readonly string label; protected FillFlowContainer Content { get; private set; } - public RowAttribute(ControlPoint point) + public RowAttribute(ControlPoint point, string label) { this.point = point; + this.label = label; } [BackgroundDependencyLoader] @@ -72,7 +74,7 @@ namespace osu.Game.Screens.Edit.Timing Origin = Anchor.CentreLeft, Padding = new MarginPadding(3), Font = OsuFont.Default.With(weight: FontWeight.SemiBold, size: 12), - Text = point.GetType().Name.Replace("ControlPoint", string.Empty).ToLowerInvariant(), + Text = label, Colour = colours.Gray0 }, }, diff --git a/osu.Game/Screens/Edit/Timing/RowAttributes/TimingRowAttribute.cs b/osu.Game/Screens/Edit/Timing/RowAttributes/TimingRowAttribute.cs index 07e041650c..c6e2649f8e 100644 --- a/osu.Game/Screens/Edit/Timing/RowAttributes/TimingRowAttribute.cs +++ b/osu.Game/Screens/Edit/Timing/RowAttributes/TimingRowAttribute.cs @@ -12,14 +12,14 @@ using osu.Game.Graphics.Sprites; namespace osu.Game.Screens.Edit.Timing.RowAttributes { - internal class TimingRowAttribute : RowAttribute + public class TimingRowAttribute : RowAttribute { private readonly BindableNumber beatLength; private readonly Bindable timeSignature; private OsuSpriteText text; public TimingRowAttribute(TimingControlPoint timing) - : base(timing) + : base(timing, "timing") { timeSignature = timing.TimeSignatureBindable.GetBoundCopy(); beatLength = timing.BeatLengthBindable.GetBoundCopy();