andrey
/
Marlin_FB4S
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Switch col vs row variable name (#15072)

pull/1/head
Robby Candra 5 years ago
committed by Scott Lahteine
parent
604bdf0b43
commit
ca084dcfe8
1 changed files with 7 additions and 7 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      Marlin/src/lcd/ultralcd.cpp

14
Marlin/src/lcd/ultralcd.cpp
View File

@ -266,17 +266,17 @@ millis_t next_button_update_ms;
void MarlinUI::draw_select_screen_prompt(PGM_P const pref, const char * const string/*=nullptr*/, PGM_P const suff/*=nullptr*/) { void MarlinUI::draw_select_screen_prompt(PGM_P const pref, const char * const string/*=nullptr*/, PGM_P const suff/*=nullptr*/) {
const uint8_t plen = utf8_strlen_P(pref), slen = suff ? utf8_strlen_P(suff) : 0; const uint8_t plen = utf8_strlen_P(pref), slen = suff ? utf8_strlen_P(suff) : 0;
uint8_t row = 0, col = 0; uint8_t col = 0, row = 0;
if (!string && plen + slen <= LCD_WIDTH) { if (!string && plen + slen <= LCD_WIDTH) {
row = (LCD_WIDTH - plen - slen) / 2; col = (LCD_WIDTH - plen - slen) / 2;
col = LCD_HEIGHT > 3 ? 1 : 0; row = LCD_HEIGHT > 3 ? 1 : 0;
} }
wrap_string_P(row, col, pref, true); wrap_string_P(col, row, pref, true);
if (string) { if (string) {
if (row) { row = 0; col++; } // Move to the start of the next line if (col) { col = 0; row++; } // Move to the start of the next line
wrap_string(row, col, string); wrap_string(col, row, string);
} }
if (suff) wrap_string_P(row, col, suff); if (suff) wrap_string_P(col, row, suff);
} }
#endif // HAS_LCD_MENU #endif // HAS_LCD_MENU

Write Preview
Loading…
Cancel
Save