h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-03-05 17:33:15 +08:00
Code Issues Releases Wiki Activity

Improve UI a bit

Browse Source
This commit is contained in:
Dean Herbert 2022-10-21 23:35:53 +09:00
parent bb921ff9a7
commit f516e32949
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
osu.Game/Rulesets/Edit/DistancedHitObjectComposer.cs
View File

@ -94,6 +94,7 @@ namespace osu.Game.Rulesets.Edit
Debug.Assert(objects != null); Debug.Assert(objects != null);
DistanceSpacingMultiplier.Value = ReadCurrentDistanceSnap(objects.Value.before, objects.Value.after); DistanceSpacingMultiplier.Value = ReadCurrentDistanceSnap(objects.Value.before, objects.Value.after);
// TODO: This should probably also force distance spacing grid on.
}, },
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
} }
@ -130,20 +131,22 @@ namespace osu.Game.Rulesets.Edit
(HitObject before, HitObject after)? objects = getObjectsOnEitherSideOfCurrentTime(); (HitObject before, HitObject after)? objects = getObjectsOnEitherSideOfCurrentTime();
if (objects != null) double currentSnap = objects == null
{ ? 0
double currentSnap = ReadCurrentDistanceSnap(objects.Value.before, objects.Value.after); : ReadCurrentDistanceSnap(objects.Value.before, objects.Value.after);
if (currentSnap > DistanceSpacingMultiplier.MinValue)
{
currentDistanceSpacingButton.Enabled.Value = currentDistanceSpacingButton.Expanded.Value currentDistanceSpacingButton.Enabled.Value = currentDistanceSpacingButton.Expanded.Value
&& !Precision.AlmostEquals(currentSnap, DistanceSpacingMultiplier.Value, DistanceSpacingMultiplier.Precision / 2); && !Precision.AlmostEquals(currentSnap, DistanceSpacingMultiplier.Value, DistanceSpacingMultiplier.Precision / 2);
currentDistanceSpacingButton.ContractedLabelText = $"(current {currentSnap:N2}x)"; currentDistanceSpacingButton.ContractedLabelText = $"current {currentSnap:N2}x";
currentDistanceSpacingButton.ExpandedLabelText = $"Use current ({currentSnap:N2}x)"; currentDistanceSpacingButton.ExpandedLabelText = $"Use current ({currentSnap:N2}x)";
} }
else else
{ {
currentDistanceSpacingButton.Enabled.Value = false; currentDistanceSpacingButton.Enabled.Value = false;
currentDistanceSpacingButton.ContractedLabelText = "Current N/A"; currentDistanceSpacingButton.ContractedLabelText = string.Empty;
currentDistanceSpacingButton.ExpandedLabelText = "Use current (N/A)"; currentDistanceSpacingButton.ExpandedLabelText = "Use current (unavailable)";
} }
} }

2
osu.Game/Rulesets/Edit/ExpandableButton.cs
View File

@ -92,7 +92,7 @@ namespace osu.Game.Rulesets.Edit
SpriteText.Anchor = Anchor.CentreLeft; SpriteText.Anchor = Anchor.CentreLeft;
SpriteText.Origin = Anchor.CentreLeft; SpriteText.Origin = Anchor.CentreLeft;
SpriteText.Font = OsuFont.GetFont(weight: FontWeight.Regular); SpriteText.Font = OsuFont.GetFont(weight: FontWeight.Regular);
base.Height = SpriteText.DrawHeight; base.Height = actualHeight / 2;
Background.Hide(); Background.Hide();
} }
}, true); }, true);