RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Applied suggested changes

This commit is contained in:
EVAST9919 2017-05-10 10:14:44 +03:00
parent 7b17e331c4
commit d8f9e71b84
1 changed files with 15 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
osu.Game/Screens/Play/SongProgressInfo.cs
View File

@ -23,7 +23,7 @@ public class SongProgressInfo : Container
private int previousPercent;
private int previousSecond;
private bool defaultsSetted;
private double previousTimespan;
private const int margin = 10;
@ -75,37 +75,24 @@ protected override void Update()
double songCurrentTime = AudioClock.CurrentTime - startTime;
if (!defaultsSetted)
{
timeCurrent.Text = @"0:00";
timeLeft.Text = TimeSpan.FromMilliseconds(endTime - startTime).ToString(@"m\:ss");
progress.Text = @"0%";
int currentSecond = TimeSpan.FromMilliseconds(songCurrentTime).Seconds;
defaultsSetted = true;
if (currentSecond != previousSecond || (previousTimespan < 0 && songCurrentTime > 0))
{
previousTimespan = songCurrentTime;
previousSecond = currentSecond;
timeCurrent.Text = ((songCurrentTime < 0) ? @"-" : @"") + TimeSpan.FromMilliseconds(songCurrentTime).ToString(@"m\:ss");
timeLeft.Text = @"-" + TimeSpan.FromMilliseconds(endTime - AudioClock.CurrentTime).ToString(@"m\:ss");
}
else
int currentPercent = (int)(songCurrentTime / (endTime - startTime) * 100);
if (currentPercent != previousPercent)
{
if(songCurrentTime >= 0)
{
int currentSecond = TimeSpan.FromMilliseconds(songCurrentTime).Seconds;
previousPercent = currentPercent;
if (currentSecond != previousSecond)
{
previousSecond = currentSecond;
timeCurrent.Text = TimeSpan.FromMilliseconds(songCurrentTime).ToString(@"m\:ss");
timeLeft.Text = @"-" + TimeSpan.FromMilliseconds(endTime - AudioClock.CurrentTime).ToString(@"m\:ss");
}
int currentPercent = (int)(songCurrentTime / (endTime - startTime) * 100);
if (currentPercent != previousPercent)
{
previousPercent = currentPercent;
progress.Text = currentPercent.ToString() + @"%";
}
}
progress.Text = ((currentPercent <= 0) ? @"0" : currentPercent.ToString()) + @"%";
}
}
}