Merge pull request #448 from CryZe/split-columns-segment-time-formatter

Use `SegmentTime` Formatter for Segment Time Columns
LiveSplit · Oct 1, 2021 · 1209a3b · 1209a3b
2 parents 54cdd3d + 9eb4966
commit 1209a3b
Show file tree

Hide file tree

Showing 3 changed files with 71 additions and 66 deletions.
diff --git a/src/component/splits/column.rs b/src/component/splits/column.rs
@@ -138,7 +138,7 @@ impl Clear for ColumnState {
 enum ColumnFormatter {
     Time,
     Delta,
-    PossibleTimeSave,
+    SegmentTime,
 }
 
 pub fn update_state(
@@ -184,12 +184,12 @@ pub fn update_state(
                         method,
                     ),
                     SemanticColor::Default,
-                    ColumnFormatter::Time,
+                    ColumnFormatter::SegmentTime,
                 ),
                 ColumnStartWith::PossibleTimeSave => (
                     possible_time_save::calculate(timer, segment_index, comparison, false),
                     SemanticColor::Default,
-                    ColumnFormatter::PossibleTimeSave,
+                    ColumnFormatter::SegmentTime,
                 ),
             },
             false,
@@ -209,7 +209,7 @@ pub fn update_state(
                 "{}",
                 Delta::with_decimal_dropping().format(column_value)
             ),
-            ColumnFormatter::PossibleTimeSave => {
+            ColumnFormatter::SegmentTime => {
                 write!(state.value, "{}", SegmentTime::new().format(column_value))
             }
         };
@@ -302,20 +302,20 @@ fn column_update_value(
         (SegmentTime, false) => (
             analysis::previous_segment_time(timer, segment_index, method),
             SemanticColor::Default,
-            ColumnFormatter::Time,
+            ColumnFormatter::SegmentTime,
         ),
         (SegmentTime, true) => (
             analysis::live_segment_time(timer, segment_index, method),
             SemanticColor::Default,
-            ColumnFormatter::Time,
+            ColumnFormatter::SegmentTime,
         ),
 
         (SegmentDelta | SegmentDeltaWithFallback, false) => {
             let delta = analysis::previous_segment_delta(timer, segment_index, comparison, method);
             let (value, formatter) = if delta.is_none() && column.update_with.has_fallback() {
                 (
                     analysis::previous_segment_time(timer, segment_index, method),
-                    ColumnFormatter::Time,
+                    ColumnFormatter::SegmentTime,
                 )
             } else {
                 (delta, ColumnFormatter::Delta)