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

Fix `Use24HourDisplay` conditional flipped

This commit is contained in:
Salman Ahmed 2022-04-07 15:56:12 +03:00
parent b2c0eaeab4
commit c323020fcf
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Game/Overlays/Toolbar/DigitalClockDisplay.cs
View File

@ -40,6 +40,7 @@ public bool Use24HourDisplay
return;
use24HourDisplay = value;
updateMetrics();
UpdateDisplay(DateTimeOffset.Now); //Update realTime.Text immediately instead of waiting until next second
}
@ -66,7 +67,7 @@ private void load(OsuColour colours)
protected override void UpdateDisplay(DateTimeOffset now)
{
realTime.Text = use24HourDisplay ? $"{now:h:mm:ss tt}" : $"{now:HH:mm:ss}";
realTime.Text = use24HourDisplay ? $"{now:HH:mm:ss}" : $"{now:h:mm:ss tt}";
gameTime.Text = $"running {new TimeSpan(TimeSpan.TicksPerSecond * (int)(Clock.CurrentTime / 1000)):c}";
}

2
osu.Game/Overlays/Toolbar/ToolbarClock.cs
View File

@ -97,7 +97,7 @@ protected override void LoadComplete()
analog.FadeTo(showAnalog ? 1 : 0);
}, true);
prefer24HourTime.BindValueChanged(prefer24H => digital.Use24HourDisplay = !prefer24H.NewValue, true);
prefer24HourTime.BindValueChanged(prefer24H => digital.Use24HourDisplay = prefer24H.NewValue, true);
}
protected override bool OnClick(ClickEvent e)