sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-23 19:30:06 +09:00
Code Issues Packages Projects Releases Wiki Activity

Use explicit label

Browse Source
This commit is contained in:
Dean Herbert
2021-04-19 15:27:38 +09:00
parent a10a8680d0
commit d3cebfb6fb
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game/Screens/Edit/Timing/RowAttribute.cs
View File

@ -16,12 +16,14 @@ namespace osu.Game.Screens.Edit.Timing
public class RowAttribute : CompositeDrawable public class RowAttribute : CompositeDrawable
{ {
private readonly ControlPoint point; private readonly ControlPoint point;
private readonly string label;
protected FillFlowContainer Content { get; private set; } protected FillFlowContainer Content { get; private set; }
public RowAttribute(ControlPoint point) public RowAttribute(ControlPoint point, string label)
{ {
this.point = point; this.point = point;
this.label = label;
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
@ -72,7 +74,7 @@ namespace osu.Game.Screens.Edit.Timing
Origin = Anchor.CentreLeft, Origin = Anchor.CentreLeft,
Padding = new MarginPadding(3), Padding = new MarginPadding(3),
Font = OsuFont.Default.With(weight: FontWeight.SemiBold, size: 12), Font = OsuFont.Default.With(weight: FontWeight.SemiBold, size: 12),
Text = point.GetType().Name.Replace("ControlPoint", string.Empty).ToLowerInvariant(), Text = label,
Colour = colours.Gray0 Colour = colours.Gray0
}, },
}, },

4
osu.Game/Screens/Edit/Timing/RowAttributes/TimingRowAttribute.cs
View File

@ -12,14 +12,14 @@ using osu.Game.Graphics.Sprites;
namespace osu.Game.Screens.Edit.Timing.RowAttributes namespace osu.Game.Screens.Edit.Timing.RowAttributes
{ {
internal class TimingRowAttribute : RowAttribute public class TimingRowAttribute : RowAttribute
{ {
private readonly BindableNumber<double> beatLength; private readonly BindableNumber<double> beatLength;
private readonly Bindable<TimeSignatures> timeSignature; private readonly Bindable<TimeSignatures> timeSignature;
private OsuSpriteText text; private OsuSpriteText text;
public TimingRowAttribute(TimingControlPoint timing) public TimingRowAttribute(TimingControlPoint timing)
: base(timing) : base(timing, "timing")
{ {
timeSignature = timing.TimeSignatureBindable.GetBoundCopy(); timeSignature = timing.TimeSignatureBindable.GetBoundCopy();
beatLength = timing.BeatLengthBindable.GetBoundCopy(); beatLength = timing.BeatLengthBindable.GetBoundCopy();