Add spacing to timer duration formats (#3471)
<img width="426" height="28" alt="image" src="https://github.com/user-attachments/assets/b281aca3-3c8d-4b88-a017-5d2f8ea9f3d5" />
This commit is contained in:
@@ -32,7 +32,7 @@ pub(crate) struct StatusIndicatorWidget {
|
||||
}
|
||||
|
||||
// Format elapsed seconds into a compact human-friendly form used by the status line.
|
||||
// Examples: 0s, 59s, 1m00s, 59m59s, 1h00m00s, 2h03m09s
|
||||
// Examples: 0s, 59s, 1m 00s, 59m 59s, 1h 00m 00s, 2h 03m 09s
|
||||
fn fmt_elapsed_compact(elapsed_secs: u64) -> String {
|
||||
if elapsed_secs < 60 {
|
||||
return format!("{elapsed_secs}s");
|
||||
@@ -40,12 +40,12 @@ fn fmt_elapsed_compact(elapsed_secs: u64) -> String {
|
||||
if elapsed_secs < 3600 {
|
||||
let minutes = elapsed_secs / 60;
|
||||
let seconds = elapsed_secs % 60;
|
||||
return format!("{minutes}m{seconds:02}s");
|
||||
return format!("{minutes}m {seconds:02}s");
|
||||
}
|
||||
let hours = elapsed_secs / 3600;
|
||||
let minutes = (elapsed_secs % 3600) / 60;
|
||||
let seconds = elapsed_secs % 60;
|
||||
format!("{hours}h{minutes:02}m{seconds:02}s")
|
||||
format!("{hours}h {minutes:02}m {seconds:02}s")
|
||||
}
|
||||
|
||||
impl StatusIndicatorWidget {
|
||||
@@ -209,13 +209,13 @@ mod tests {
|
||||
assert_eq!(fmt_elapsed_compact(0), "0s");
|
||||
assert_eq!(fmt_elapsed_compact(1), "1s");
|
||||
assert_eq!(fmt_elapsed_compact(59), "59s");
|
||||
assert_eq!(fmt_elapsed_compact(60), "1m00s");
|
||||
assert_eq!(fmt_elapsed_compact(61), "1m01s");
|
||||
assert_eq!(fmt_elapsed_compact(3 * 60 + 5), "3m05s");
|
||||
assert_eq!(fmt_elapsed_compact(59 * 60 + 59), "59m59s");
|
||||
assert_eq!(fmt_elapsed_compact(3600), "1h00m00s");
|
||||
assert_eq!(fmt_elapsed_compact(3600 + 60 + 1), "1h01m01s");
|
||||
assert_eq!(fmt_elapsed_compact(25 * 3600 + 2 * 60 + 3), "25h02m03s");
|
||||
assert_eq!(fmt_elapsed_compact(60), "1m 00s");
|
||||
assert_eq!(fmt_elapsed_compact(61), "1m 01s");
|
||||
assert_eq!(fmt_elapsed_compact(3 * 60 + 5), "3m 05s");
|
||||
assert_eq!(fmt_elapsed_compact(59 * 60 + 59), "59m 59s");
|
||||
assert_eq!(fmt_elapsed_compact(3600), "1h 00m 00s");
|
||||
assert_eq!(fmt_elapsed_compact(3600 + 60 + 1), "1h 01m 01s");
|
||||
assert_eq!(fmt_elapsed_compact(25 * 3600 + 2 * 60 + 3), "25h 02m 03s");
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
||||
Reference in New Issue
Block a user