Skip to content

Commit c0337da

Browse files
authored
🚸 Scroll long filename on MKS TFT (#23031)
1 parent 11f1335 commit c0337da

1 file changed

Lines changed: 4 additions & 5 deletions

File tree

Marlin/src/lcd/tft/ui_common.cpp

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -167,18 +167,17 @@ void MenuEditItemBase::draw(const bool sel, const uint8_t row, PGM_P const pstr,
167167
void MenuItem_static::draw(const uint8_t row, PGM_P const pstr, const uint8_t style/*=SS_DEFAULT*/, const char * const vstr/*=nullptr*/) {
168168
menu_item(row);
169169
tft_string.set(pstr, itemIndex, itemString);
170-
if (vstr)
171-
tft_string.add(vstr);
170+
if (vstr) tft_string.add(vstr);
172171
tft.add_text(tft_string.center(TFT_WIDTH), MENU_TEXT_Y_OFFSET, COLOR_YELLOW, tft_string);
173172
}
174173

175174
#if ENABLED(SDSUPPORT)
176175

177176
void MenuItem_sdbase::draw(const bool sel, const uint8_t row, PGM_P const, CardReader &theCard, const bool isDir) {
178177
menu_item(row, sel);
179-
if (isDir)
180-
tft.add_image(MENU_ITEM_ICON_X, MENU_ITEM_ICON_Y, imgDirectory, COLOR_MENU_TEXT, sel ? COLOR_SELECTION_BG : COLOR_BACKGROUND);
181-
tft.add_text(MENU_ITEM_ICON_SPACE, MENU_TEXT_Y_OFFSET, COLOR_MENU_TEXT, theCard.longest_filename());
178+
if (isDir) tft.add_image(MENU_ITEM_ICON_X, MENU_ITEM_ICON_Y, imgDirectory, COLOR_MENU_TEXT, sel ? COLOR_SELECTION_BG : COLOR_BACKGROUND);
179+
constexpr uint8_t maxlen = (MENU_ITEM_HEIGHT) - (MENU_TEXT_Y_OFFSET) + 1;
180+
tft.add_text(MENU_ITEM_ICON_SPACE, MENU_TEXT_Y_OFFSET, COLOR_MENU_TEXT, ui.scrolled_filename(theCard, maxlen, row, sel));
182181
}
183182

184183
#endif

0 commit comments

Comments
 (0)