h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-15 12:27:26 +08:00
Code Issues Releases Wiki Activity

Refactor progress tooltip updating method

Browse Source 
* Rewrite calculating logic
* Remove useless variables
This commit is contained in:
CloneWith 2024-10-04 23:30:50 +08:00
parent fd5655455a
commit d7ba4ce7f2
No known key found for this signature in database
GPG Key ID: F4FC0D1E91D7FFD5
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
osu.Game/Screens/Play/HUD/ArgonSongProgressBar.cs
View File

@ -37,9 +37,7 @@ namespace osu.Game.Screens.Play.HUD
private float relativePositionX;
public LocalisableString TooltipText => $"{formatTime(TimeSpan.FromSeconds(relativePositionX > 0 ? Math.Round((EndTime - StartTime) * relativePositionX / DrawWidth / 1000)
: relativePositionX > DrawWidth ? Math.Round(EndTime / 1000) : 0))}"
+ $" - {(relativePositionX > 0 ? Math.Round(relativePositionX / DrawWidth * 100, 1) : relativePositionX > DrawWidth ? 100 : 0)}%";
public LocalisableString TooltipText => updateTooltip();
public ArgonSongProgressBar(float barHeight)
{
@ -84,6 +82,19 @@ namespace osu.Game.Screens.Play.HUD
catchUpColour = colours.BlueDark;
}
private LocalisableString updateTooltip()
{
// clamping in case the cursor lays out of the progress bar horizontally
double progress = Math.Clamp(relativePositionX, 0, DrawWidth) / DrawWidth;
TimeSpan currentSpan = TimeSpan.FromMilliseconds(Math.Round((EndTime - StartTime) * progress));
int currentSeconds = currentSpan.Duration().Seconds;
// merging hours and minutes, e.g. 1:15:55 -> 75:55
int currentMinutes = (int)Math.Floor(currentSpan.Duration().TotalMinutes);
return $"{currentMinutes}:{currentSeconds:D2} - {progress:P1}";
}
protected override void LoadComplete()
{
base.LoadComplete();
@ -191,7 +202,5 @@ namespace osu.Game.Screens.Play.HUD
set => fill.Colour = value;
}
}
private string formatTime(TimeSpan timeSpan) => $"{(timeSpan < TimeSpan.Zero ? "-" : "")}{Math.Floor(timeSpan.Duration().TotalMinutes)}:{timeSpan.Duration().Seconds:D2}";
}
}