0x90/Marlin
12
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

🧑‍💻 Use ftpl for item strings (#26462)

Browse source
This commit is contained in:
Andrew 2023-11-25 17:45:39 -05:00 committed by Scott Lahteine
parent 924d7769ec
commit 20a26d5053
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Marlin/src/lcd/menu/menu.h
View file

@ -65,11 +65,11 @@ class MenuItemBase {
// Implementation-specific: // Implementation-specific:
// Draw an item either selected (pre_char) or not (space) with post_char // Draw an item either selected (pre_char) or not (space) with post_char
// Menus may set up itemIndex, itemStringC/F and pass them to string-building or string-emitting functions // Menus may set up itemIndex, itemStringC/F and pass them to string-building or string-emitting functions
static void _draw(const bool sel, const uint8_t row, FSTR_P const fstr, const char pre_char, const char post_char); static void _draw(const bool sel, const uint8_t row, FSTR_P const ftpl, const char pre_char, const char post_char);
// Draw an item either selected ('>') or not (space) with post_char // Draw an item either selected ('>') or not (space) with post_char
FORCE_INLINE static void _draw(const bool sel, const uint8_t row, FSTR_P const fstr, const char post_char) { FORCE_INLINE static void _draw(const bool sel, const uint8_t row, FSTR_P const ftpl, const char post_char) {
_draw(sel, row, fstr, '>', post_char); _draw(sel, row, ftpl, '>', post_char);
} }
}; };
@ -82,8 +82,8 @@ class MenuItem_static : public MenuItemBase {
// BACK_ITEM(LABEL) // BACK_ITEM(LABEL)
class MenuItem_back : public MenuItemBase { class MenuItem_back : public MenuItemBase {
public: public:
FORCE_INLINE static void draw(const bool sel, const uint8_t row, FSTR_P const fstr) { FORCE_INLINE static void draw(const bool sel, const uint8_t row, FSTR_P const ftpl) {
_draw(sel, row, fstr, LCD_STR_UPLEVEL[0], LCD_STR_UPLEVEL[0]); _draw(sel, row, ftpl, LCD_STR_UPLEVEL[0], LCD_STR_UPLEVEL[0]);
} }
// Back Item action goes back one step in history // Back Item action goes back one step in history
FORCE_INLINE static void action(FSTR_P const=nullptr) { ui.go_back(); } FORCE_INLINE static void action(FSTR_P const=nullptr) { ui.go_back(); }