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

Drop TALL_FONT_CORRECTION

Browse Source
This commit is contained in:
Scott Lahteine
2018-10-27 13:07:03 -05:00
parent c825c419d4
commit 774a6e8199
7 changed files with 20 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Marlin/src/lcd/menu/menu.cpp
View File

@ -101,12 +101,7 @@ bool liveEdit;
float raw_Ki, raw_Kd; // place-holders for Ki and Kd edits
#endif
#ifndef TALL_FONT_CORRECTION
#define TALL_FONT_CORRECTION 0
#endif
bool no_reentry = false;
constexpr int8_t menu_bottom = LCD_HEIGHT - (TALL_FONT_CORRECTION);
// Initialized by settings.load()
int16_t lcd_preheat_hotend_temp[2], lcd_preheat_bed_temp[2];
@ -478,8 +473,8 @@ void scroll_screen(const uint8_t limit, const bool is_menu) {
}
if (is_menu) {
NOMORE(encoderTopLine, encoderLine);
if (encoderLine >= encoderTopLine + menu_bottom)
encoderTopLine = encoderLine - menu_bottom + 1;
if (encoderLine >= encoderTopLine + LCD_HEIGHT)
encoderTopLine = encoderLine - LCD_HEIGHT + 1;
}
else
encoderTopLine = encoderLine;

4
Marlin/src/lcd/menu/menu.h
View File

@ -179,7 +179,7 @@ void menu_action_setting_edit_callback_bool(PGM_P pstr, bool* ptr, screenFunc_t
*/
#define SCREEN_OR_MENU_LOOP() \
int8_t _menuLineNr = encoderTopLine, _thisItemNr; \
for (int8_t _lcdLineNr = 0; _lcdLineNr < menu_bottom; _lcdLineNr++, _menuLineNr++) { \
for (int8_t _lcdLineNr = 0; _lcdLineNr < LCD_HEIGHT; _lcdLineNr++, _menuLineNr++) { \
_thisItemNr = 0
/**
@ -190,7 +190,7 @@ void menu_action_setting_edit_callback_bool(PGM_P pstr, bool* ptr, screenFunc_t
* Scroll as-needed to keep the selected line in view.
*/
#define START_SCREEN() \
scroll_screen(menu_bottom, false); \
scroll_screen(LCD_HEIGHT, false); \
bool _skipStatic = false; \
SCREEN_OR_MENU_LOOP()