Mercurial > public > ostc4

changeset 1043:52fd91414b6c GasConsumption

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Improvments scrubber timer: The scrubbertime in the CCR sumary view was not right aligned. This has been changed => the line matches the layout of the other lines. In addition the scrubber display mode was not visible after opening the scrubber menu because its drawing was depending on a function parameter which was not set by the open function.
author Ideenmodellierer
date Mon, 27 Oct 2025 20:09:23 +0100
parents 7efc8baa3ffa
children b018e1f3082e
files Discovery/Src/t7.c Discovery/Src/tMenuEditXtra.c
diffstat 2 files changed, 8 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/Discovery/Src/t7.c	Mon Oct 27 20:06:27 2025 +0100
+++ b/Discovery/Src/t7.c	Mon Oct 27 20:09:23 2025 +0100
@@ -1949,7 +1949,7 @@
 
         data[dataIndex++] = '\n';
         data[dataIndex++] = '\r';
-        data[dataIndex++] = '\t';
+        data[dataIndex++] = '\002';
         dataIndex += printScrubberText(&data[dataIndex], 10, settings->scrubberData, settings, false);
     }
 
--- a/Discovery/Src/tMenuEditXtra.c	Mon Oct 27 20:06:27 2025 +0100
+++ b/Discovery/Src/tMenuEditXtra.c	Mon Oct 27 20:09:23 2025 +0100
@@ -274,20 +274,14 @@
     }
 	write_label_var(20, 780, ME_Y_LINE5, &FontT48, text);
 
-    if (isRefresh) {
-        switch (settings->scrubTimerMode) {
-            case SCRUB_TIMER_MINUTES:
-            default:
-                snprintf(text, 32, "%c\002%c", TXT_ScrubTimeMode, TXT_Minutes);
-
-                break;
-            case SCRUB_TIMER_PERCENT:
-                snprintf(text, 32, "%c\002%c", TXT_ScrubTimeMode, TXT_Percent);
-
-                break;
-        }
-        write_field_button(StMXTRA_ScrubTimer_OP_Mode, 20, 780, ME_Y_LINE6, &FontT48, text);
+    switch (settings->scrubTimerMode) {
+    	case SCRUB_TIMER_MINUTES:
+        default:					snprintf(text, 32, "%c\002%c", TXT_ScrubTimeMode, TXT_Minutes);
+        	break;
+        case SCRUB_TIMER_PERCENT:  	snprintf(text, 32, "%c\002%c", TXT_ScrubTimeMode, TXT_Percent);
+            break;
     }
+    write_field_button(StMXTRA_ScrubTimer_OP_Mode, 20, 780, ME_Y_LINE6, &FontT48, text);
 
     setEvent(StMXTRA_ScrubTimer, (uint32_t)OnAction_ScrubberTimerId);
     setEvent(StMXTRA_ScrubTimer_Active, (uint32_t)OnAction_ScrubberActive);