Browse Source

Adjustment to DOG_CHAR_*_EDIT

Scott Lahteine 7 years ago
parent
commit
38d62494ef
1 changed files with 8 additions and 8 deletions
  1. 8
    8
      Marlin/src/lcd/ultralcd_impl_DOGM.h

+ 8
- 8
Marlin/src/lcd/ultralcd_impl_DOGM.h View File

143
 #if ENABLED(USE_BIG_EDIT_FONT)
143
 #if ENABLED(USE_BIG_EDIT_FONT)
144
   #define FONT_MENU_EDIT_NAME u8g_font_9x18
144
   #define FONT_MENU_EDIT_NAME u8g_font_9x18
145
   #define DOG_CHAR_WIDTH_EDIT  9
145
   #define DOG_CHAR_WIDTH_EDIT  9
146
-  #define DOG_CHAR_HEIGHT_EDIT 13
147
-  #define LCD_WIDTH_EDIT       14
146
+  #define DOG_CHAR_HEIGHT_EDIT 18
148
 #else
147
 #else
149
   #define FONT_MENU_EDIT_NAME FONT_MENU_NAME
148
   #define FONT_MENU_EDIT_NAME FONT_MENU_NAME
150
-  #define DOG_CHAR_WIDTH_EDIT  6
151
-  #define DOG_CHAR_HEIGHT_EDIT 12
152
-  #define LCD_WIDTH_EDIT       22
149
+  #define DOG_CHAR_WIDTH_EDIT  DOG_CHAR_WIDTH
150
+  #define DOG_CHAR_HEIGHT_EDIT DOG_CHAR_HEIGHT
153
 #endif
151
 #endif
154
 
152
 
155
 #ifndef TALL_FONT_CORRECTION
153
 #ifndef TALL_FONT_CORRECTION
935
     const uint8_t labellen = lcd_strlen_P(pstr),
933
     const uint8_t labellen = lcd_strlen_P(pstr),
936
                   vallen = lcd_strlen(value);
934
                   vallen = lcd_strlen(value);
937
 
935
 
936
+    constexpr uint8_t lcd_width_edit = (LCD_WIDTH) / (DOG_CHAR_WIDTH_EDIT);
937
+
938
     uint8_t rows = (labellen > LCD_WIDTH - 2 - vallen) ? 2 : 1;
938
     uint8_t rows = (labellen > LCD_WIDTH - 2 - vallen) ? 2 : 1;
939
 
939
 
940
     #if ENABLED(USE_BIG_EDIT_FONT)
940
     #if ENABLED(USE_BIG_EDIT_FONT)
941
       uint8_t lcd_width, char_width;
941
       uint8_t lcd_width, char_width;
942
-      if (labellen <= LCD_WIDTH_EDIT - 1) {
943
-        if (labellen + vallen + 2 >= LCD_WIDTH_EDIT) rows = 2;
944
-        lcd_width = LCD_WIDTH_EDIT + 1;
942
+      if (labellen <= lcd_width_edit - 1) {
943
+        if (labellen + vallen + 2 >= lcd_width_edit) rows = 2;
944
+        lcd_width = lcd_width_edit + 1;
945
         char_width = DOG_CHAR_WIDTH_EDIT;
945
         char_width = DOG_CHAR_WIDTH_EDIT;
946
         lcd_setFont(FONT_MENU_EDIT);
946
         lcd_setFont(FONT_MENU_EDIT);
947
       }
947
       }

Loading…
Cancel
Save