patrick/OpenDTU-old
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'pr1732' into dev

Browse Source
This commit is contained in:
Thomas Basler 2024-02-10 23:37:09 +01:00
commit 1d2055cc89
1 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/Display_Graphic.cpp
View File

@ -112,27 +112,23 @@ void DisplayGraphicClass::printText(const char* text, const uint8_t line)
if (!_isLarge) { if (!_isLarge) {
dispX = (line == 0) ? 5 : 0; dispX = (line == 0) ? 5 : 0;
} else { } else {
switch (line) { if (line == 0 && _diagram_mode == DiagramMode_t::Small) {
case 0:
if (_diagram_mode == DiagramMode_t::Small) {
// Center between left border and diagram // Center between left border and diagram
dispX = (CHART_POSX - _display->getStrWidth(text)) / 2; dispX = (CHART_POSX - _display->getStrWidth(text)) / 2;
} else { } else {
// Center on screen // Center on screen
dispX = (_display->getDisplayWidth() - _display->getStrWidth(text)) / 2; dispX = (_display->getDisplayWidth() - _display->getStrWidth(text)) / 2;
} }
break;
case 3:
// Center on screen
dispX = (_display->getDisplayWidth() - _display->getStrWidth(text)) / 2;
break;
default:
dispX = 5;
break;
}
} }
dispX += enableScreensaver ? (_mExtra % 7) : 0; if (enableScreensaver) {
unsigned maxOffset = (_isLarge?8:6);
unsigned period = 2 * maxOffset;
unsigned step = _mExtra % period;
int offset = (step <= maxOffset)?step:(period - step);
offset -= (_isLarge?5:0); // oscillate around center on large screens
dispX += offset;
}
_display->drawStr(dispX, _lineOffsets[line], text); _display->drawStr(dispX, _lineOffsets[line], text);
} }