Mercurial > public > ostc4
comparison Discovery/Src/tMenuEditXtra.c @ 1043:52fd91414b6c GasConsumption
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 | 808153ba3fec |
| children |
comparison
equal
deleted
inserted
replaced
| 1042:7efc8baa3ffa | 1043:52fd91414b6c |
|---|---|
| 272 if (isRefresh) { | 272 if (isRefresh) { |
| 273 clean_content(20, 780, ME_Y_LINE5, &FontT48); | 273 clean_content(20, 780, ME_Y_LINE5, &FontT48); |
| 274 } | 274 } |
| 275 write_label_var(20, 780, ME_Y_LINE5, &FontT48, text); | 275 write_label_var(20, 780, ME_Y_LINE5, &FontT48, text); |
| 276 | 276 |
| 277 if (isRefresh) { | 277 switch (settings->scrubTimerMode) { |
| 278 switch (settings->scrubTimerMode) { | 278 case SCRUB_TIMER_MINUTES: |
| 279 case SCRUB_TIMER_MINUTES: | 279 default: snprintf(text, 32, "%c\002%c", TXT_ScrubTimeMode, TXT_Minutes); |
| 280 default: | 280 break; |
| 281 snprintf(text, 32, "%c\002%c", TXT_ScrubTimeMode, TXT_Minutes); | 281 case SCRUB_TIMER_PERCENT: snprintf(text, 32, "%c\002%c", TXT_ScrubTimeMode, TXT_Percent); |
| 282 | 282 break; |
| 283 break; | 283 } |
| 284 case SCRUB_TIMER_PERCENT: | 284 write_field_button(StMXTRA_ScrubTimer_OP_Mode, 20, 780, ME_Y_LINE6, &FontT48, text); |
| 285 snprintf(text, 32, "%c\002%c", TXT_ScrubTimeMode, TXT_Percent); | |
| 286 | |
| 287 break; | |
| 288 } | |
| 289 write_field_button(StMXTRA_ScrubTimer_OP_Mode, 20, 780, ME_Y_LINE6, &FontT48, text); | |
| 290 } | |
| 291 | 285 |
| 292 setEvent(StMXTRA_ScrubTimer, (uint32_t)OnAction_ScrubberTimerId); | 286 setEvent(StMXTRA_ScrubTimer, (uint32_t)OnAction_ScrubberTimerId); |
| 293 setEvent(StMXTRA_ScrubTimer_Active, (uint32_t)OnAction_ScrubberActive); | 287 setEvent(StMXTRA_ScrubTimer_Active, (uint32_t)OnAction_ScrubberActive); |
| 294 setEvent(StMXTRA_ScrubTimer_Max, (uint32_t)OnAction_ScrubberTimerMax); | 288 setEvent(StMXTRA_ScrubTimer_Max, (uint32_t)OnAction_ScrubberTimerMax); |
| 295 setEvent(StMXTRA_ScrubTimer_Reset, (uint32_t)OnAction_ScrubberReset); | 289 setEvent(StMXTRA_ScrubTimer_Reset, (uint32_t)OnAction_ScrubberReset); |
