h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-21 06:42:54 +08:00
Code Issues Releases Wiki Activity

Rename variable and fix inspections

Browse Source
This commit is contained in:
Dean Herbert 2022-04-07 18:11:30 +09:00
parent 2525ec0d18
commit 37509e04a9
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,17 +29,17 @@ namespace osu.Game.Overlays.Toolbar
} }
} }
private bool format12H = false; private bool use24HourDisplay;
public bool Format12H public bool Use24HourDisplay
{ {
get => format12H; get => use24HourDisplay;
set set
{ {
if (format12H == value) if (use24HourDisplay == value)
return; return;
format12H = value; use24HourDisplay = value;
updateMetrics(); updateMetrics();
UpdateDisplay(DateTimeOffset.Now); //Update realTime.Text immediately instead of waiting until next second UpdateDisplay(DateTimeOffset.Now); //Update realTime.Text immediately instead of waiting until next second
} }
@ -66,13 +66,13 @@ namespace osu.Game.Overlays.Toolbar
protected override void UpdateDisplay(DateTimeOffset now) protected override void UpdateDisplay(DateTimeOffset now)
{ {
realTime.Text = format12H ? $"{now:h:mm:ss tt}" : $"{now:HH:mm:ss}"; realTime.Text = use24HourDisplay ? $"{now:h:mm:ss tt}" : $"{now:HH:mm:ss}";
gameTime.Text = $"running {new TimeSpan(TimeSpan.TicksPerSecond * (int)(Clock.CurrentTime / 1000)):c}"; gameTime.Text = $"running {new TimeSpan(TimeSpan.TicksPerSecond * (int)(Clock.CurrentTime / 1000)):c}";
} }
private void updateMetrics() private void updateMetrics()
{ {
if (format12H) if (use24HourDisplay)
Width = 70; Width = 70;
else else
Width = showRuntime ? 66 : 45; // Allows for space for game time up to 99 days (in the padding area since this is quite rare). Width = showRuntime ? 66 : 45; // Allows for space for game time up to 99 days (in the padding area since this is quite rare).

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

@ -99,7 +99,7 @@ namespace osu.Game.Overlays.Toolbar
}, true); }, true);
digitalPrefer24Hour.BindValueChanged(prefer24H => digitalPrefer24Hour.BindValueChanged(prefer24H =>
digital.Format12H = prefer24H.NewValue ? false : CultureInfo.CurrentCulture.DateTimeFormat.ShortTimePattern.Contains("tt"), true); digital.Use24HourDisplay = !prefer24H.NewValue && CultureInfo.CurrentCulture.DateTimeFormat.ShortTimePattern.Contains("tt"), true);
} }
protected override bool OnClick(ClickEvent e) protected override bool OnClick(ClickEvent e)