Przeglądaj źródła

Switch col vs row variable name (#15072)

Robby Candra 5 lat temu
rodzic
commit
ca084dcfe8
1 zmienionych plików z 7 dodań i 7 usunięć
  1. 7
    7
      Marlin/src/lcd/ultralcd.cpp

+ 7
- 7
Marlin/src/lcd/ultralcd.cpp Wyświetl plik

@@ -266,17 +266,17 @@ millis_t next_button_update_ms;
266 266
 
267 267
   void MarlinUI::draw_select_screen_prompt(PGM_P const pref, const char * const string/*=nullptr*/, PGM_P const suff/*=nullptr*/) {
268 268
     const uint8_t plen = utf8_strlen_P(pref), slen = suff ? utf8_strlen_P(suff) : 0;
269
-    uint8_t row = 0, col = 0;
269
+    uint8_t col = 0, row = 0;
270 270
     if (!string && plen + slen <= LCD_WIDTH) {
271
-      row = (LCD_WIDTH - plen - slen) / 2;
272
-      col = LCD_HEIGHT > 3 ? 1 : 0;
271
+      col = (LCD_WIDTH - plen - slen) / 2;
272
+      row = LCD_HEIGHT > 3 ? 1 : 0;
273 273
     }
274
-    wrap_string_P(row, col, pref, true);
274
+    wrap_string_P(col, row, pref, true);
275 275
     if (string) {
276
-      if (row) { row = 0; col++; } // Move to the start of the next line
277
-      wrap_string(row, col, string);
276
+      if (col) { col = 0; row++; } // Move to the start of the next line
277
+      wrap_string(col, row, string);
278 278
     }
279
-    if (suff) wrap_string_P(row, col, suff);
279
+    if (suff) wrap_string_P(col, row, suff);
280 280
   }
281 281
 
282 282
 #endif // HAS_LCD_MENU

Ładowanie…
Anuluj
Zapisz