From 0c39f286f6125ecc98e9216443d98a011b17a8c1 Mon Sep 17 00:00:00 2001 From: flu0r1ne Date: Thu, 13 Jul 2023 13:03:59 -0500 Subject: Fix counter to show overtime value when preset, offer reset before a clear when a counter is incremented --- src/controllers/timer_view.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/controllers') diff --git a/src/controllers/timer_view.cpp b/src/controllers/timer_view.cpp index 28abd5c..841d7f7 100644 --- a/src/controllers/timer_view.cpp +++ b/src/controllers/timer_view.cpp @@ -68,6 +68,7 @@ class TimerView { } _update_clear_reset_btn_label(); + _update_clear_reset_btn(); } /* @@ -89,6 +90,8 @@ class TimerView { _counters[counter_num].inc(); _update_counter(counter_num); + + _update_clear_reset_btn_label(); } void handle_timer_update() { @@ -181,7 +184,7 @@ class TimerView { } bool _clear_reset_btn_clears() const { - return _timer.has_preset() and !_timer.started(); + return _timer.has_preset() and !_timer.started() and (_counters[0].cnt() == 0 && _counters[1].cnt() == 0); } void _update_clear_reset_btn_label() { -- cgit v1.2.3