|
@@ -135,7 +135,7 @@
|
135
|
135
|
#define TALL_FONT_CORRECTION 0
|
136
|
136
|
#endif
|
137
|
137
|
|
138
|
|
-#define START_ROW 0
|
|
138
|
+#define START_COL 0
|
139
|
139
|
|
140
|
140
|
// LCD selection
|
141
|
141
|
#if ENABLED(U8GLIB_ST7920)
|
|
@@ -480,7 +480,7 @@ static void lcd_implementation_mark_as_selected(uint8_t row, bool isSelected) {
|
480
|
480
|
else {
|
481
|
481
|
u8g.setColorIndex(1); // unmarked text is black on white
|
482
|
482
|
}
|
483
|
|
- u8g.setPrintPos((START_ROW) * (DOG_CHAR_WIDTH), (row + 1) * (DOG_CHAR_HEIGHT));
|
|
483
|
+ u8g.setPrintPos((START_COL) * (DOG_CHAR_WIDTH), (row + 1) * (DOG_CHAR_HEIGHT));
|
484
|
484
|
}
|
485
|
485
|
|
486
|
486
|
#if ENABLED(LCD_INFO_MENU) || ENABLED(FILAMENT_CHANGE_FEATURE)
|
|
@@ -490,7 +490,7 @@ static void lcd_implementation_mark_as_selected(uint8_t row, bool isSelected) {
|
490
|
490
|
lcd_implementation_mark_as_selected(row, invert);
|
491
|
491
|
|
492
|
492
|
char c;
|
493
|
|
- int8_t n = LCD_WIDTH;
|
|
493
|
+ int8_t n = LCD_WIDTH - (START_COL);
|
494
|
494
|
|
495
|
495
|
if (center && !valstr) {
|
496
|
496
|
int8_t pad = (LCD_WIDTH - lcd_strlen_P(pstr)) / 2;
|
|
@@ -513,7 +513,7 @@ static void lcd_implementation_drawmenu_generic(bool isSelected, uint8_t row, co
|
513
|
513
|
UNUSED(pre_char);
|
514
|
514
|
|
515
|
515
|
char c;
|
516
|
|
- uint8_t n = LCD_WIDTH - 2;
|
|
516
|
+ uint8_t n = LCD_WIDTH - (START_COL) - 2;
|
517
|
517
|
|
518
|
518
|
lcd_implementation_mark_as_selected(row, isSelected);
|
519
|
519
|
|
|
@@ -530,7 +530,7 @@ static void lcd_implementation_drawmenu_generic(bool isSelected, uint8_t row, co
|
530
|
530
|
static void _drawmenu_setting_edit_generic(bool isSelected, uint8_t row, const char* pstr, const char* data, bool pgm) {
|
531
|
531
|
char c;
|
532
|
532
|
uint8_t vallen = (pgm ? lcd_strlen_P(data) : (lcd_strlen((char*)data)));
|
533
|
|
- uint8_t n = LCD_WIDTH - 2 - vallen;
|
|
533
|
+ uint8_t n = LCD_WIDTH - (START_COL) - 2 - vallen;
|
534
|
534
|
|
535
|
535
|
lcd_implementation_mark_as_selected(row, isSelected);
|
536
|
536
|
|
|
@@ -570,7 +570,7 @@ static void _drawmenu_setting_edit_generic(bool isSelected, uint8_t row, const c
|
570
|
570
|
|
571
|
571
|
void lcd_implementation_drawedit(const char* pstr, const char* value=NULL) {
|
572
|
572
|
uint8_t rows = 1;
|
573
|
|
- uint8_t lcd_width = LCD_WIDTH, char_width = DOG_CHAR_WIDTH;
|
|
573
|
+ uint8_t lcd_width = LCD_WIDTH - (START_COL), char_width = DOG_CHAR_WIDTH;
|
574
|
574
|
uint8_t vallen = lcd_strlen(value);
|
575
|
575
|
|
576
|
576
|
#if ENABLED(USE_BIG_EDIT_FONT)
|
|
@@ -604,7 +604,7 @@ void lcd_implementation_drawedit(const char* pstr, const char* value=NULL) {
|
604
|
604
|
static void _drawmenu_sd(bool isSelected, uint8_t row, const char* pstr, const char* filename, char* const longFilename, bool isDir) {
|
605
|
605
|
UNUSED(pstr);
|
606
|
606
|
char c;
|
607
|
|
- uint8_t n = LCD_WIDTH - 1;
|
|
607
|
+ uint8_t n = LCD_WIDTH - (START_COL) - 1;
|
608
|
608
|
|
609
|
609
|
if (longFilename[0]) {
|
610
|
610
|
filename = longFilename;
|