bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Fix up STATIC_ITEM (#18962)

Browse Source
This commit is contained in:
Scott Lahteine
2020-08-08 18:21:44 -05:00
committed by GitHub
parent ee69fb00a6
commit c2d5b63a98
16 changed files with 51 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Marlin/src/lcd/tft/ui_320x240.cpp
View File

@ -341,11 +341,11 @@ void MarlinUI::draw_status_screen() {
}
// Draw a static item with no left-right margin required. Centered by default.
void MenuItem_static::draw(const uint8_t row, PGM_P const pstr, const uint8_t style/*=SS_DEFAULT*/, const char * const valstr/*=nullptr*/) {
void MenuItem_static::draw(const uint8_t row, PGM_P const pstr, const uint8_t style/*=SS_DEFAULT*/, const char * const vstr/*=nullptr*/) {
menu_item(row);
tft_string.set(pstr, itemIndex, itemString);
if (valstr)
tft_string.add(valstr);
if (vstr)
tft_string.add(vstr);
tft.add_text(tft_string.center(TFT_WIDTH), MENU_TEXT_Y_OFFSET, COLOR_YELLOW, tft_string);
}

6
Marlin/src/lcd/tft/ui_480x320.cpp
View File

@ -345,11 +345,11 @@ void MarlinUI::draw_status_screen() {
}
// Draw a static item with no left-right margin required. Centered by default.
void MenuItem_static::draw(const uint8_t row, PGM_P const pstr, const uint8_t style/*=SS_DEFAULT*/, const char * const valstr/*=nullptr*/) {
void MenuItem_static::draw(const uint8_t row, PGM_P const pstr, const uint8_t style/*=SS_DEFAULT*/, const char * const vstr/*=nullptr*/) {
menu_item(row);
tft_string.set(pstr, itemIndex, itemString);
if (valstr)
tft_string.add(valstr);
if (vstr)
tft_string.add(vstr);
tft.add_text(tft_string.center(TFT_WIDTH), MENU_TEXT_Y_OFFSET, COLOR_YELLOW, tft_string);
}