From e5e7965de3add75ecf63112b8c20782f87685257 Mon Sep 17 00:00:00 2001
From: lukasradek <lukasradek@users.noreply.github.com>
Date: Mon, 7 Aug 2023 05:08:35 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=B8=20Update=20LCD=20Manual=20Leveling?=
 =?UTF-8?q?=20display=20(#26088)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/e3v2/marlinui/ui_common.cpp | 2 +-
 Marlin/src/lcd/menu/menu_bed_leveling.cpp  | 4 ++--
 Marlin/src/lcd/menu/menu_x_twist.cpp       | 4 ++--
 Marlin/src/lcd/tft/ui_color_ui.cpp         | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp b/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp
index ebfb10c8c040..27e5b38bd0a3 100644
--- a/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp
+++ b/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp
@@ -422,7 +422,7 @@ void MarlinUI::draw_status_message(const bool blink) {
       const dwin_coord_t by = (row * MENU_LINE_HEIGHT) + MENU_FONT_HEIGHT + EXTRA_ROW_HEIGHT / 2;
       dwinDrawString(true, font16x32, COLOR_YELLOW, COLOR_BG_BLACK, (LCD_PIXEL_WIDTH - vallen * 16) / 2, by, S(dwin_string.string()));
 
-      if (ui.can_show_slider()) {
+      if (ui.can_show_slider() && maxEditValue > 0) {
 
         const dwin_coord_t slider_length = LCD_PIXEL_WIDTH - TERN(DWIN_MARLINUI_LANDSCAPE, 120, 20),
                            slider_height = 16,
diff --git a/Marlin/src/lcd/menu/menu_bed_leveling.cpp b/Marlin/src/lcd/menu/menu_bed_leveling.cpp
index beb9342fb9b8..981c51a6b056 100644
--- a/Marlin/src/lcd/menu/menu_bed_leveling.cpp
+++ b/Marlin/src/lcd/menu/menu_bed_leveling.cpp
@@ -139,8 +139,8 @@
   void _lcd_level_bed_moving() {
     if (ui.should_draw()) {
       MString<9> msg;
-      msg.setf(F("%i / %u"), int(manual_probe_index + 1), total_probe_points);
-      MenuEditItemBase::draw_edit_screen(GET_TEXT_F(MSG_LEVEL_BED_NEXT_POINT), &msg);
+      msg.setf(F(" %i / %u"), int(manual_probe_index + 1), total_probe_points);
+      MenuItem_static::draw(LCD_HEIGHT / 2, GET_TEXT_F(MSG_LEVEL_BED_NEXT_POINT), SS_CENTER, msg);
     }
     ui.refresh(LCDVIEW_CALL_NO_REDRAW);
     if (!ui.wait_for_move) ui.goto_screen(_lcd_level_bed_get_z);
diff --git a/Marlin/src/lcd/menu/menu_x_twist.cpp b/Marlin/src/lcd/menu/menu_x_twist.cpp
index 6162a5e30d3b..f5ceec8f12f1 100644
--- a/Marlin/src/lcd/menu/menu_x_twist.cpp
+++ b/Marlin/src/lcd/menu/menu_x_twist.cpp
@@ -113,8 +113,8 @@ void xatc_wizard_menu() {
 void xatc_wizard_moving() {
   if (ui.should_draw()) {
     MString<9> msg;
-    msg.setf(F("%i / %u"), manual_probe_index + 1, XATC_MAX_POINTS);
-    MenuEditItemBase::draw_edit_screen(GET_TEXT_F(MSG_LEVEL_BED_NEXT_POINT), &msg);
+    msg.setf(F(" %i / %u"), manual_probe_index + 1, XATC_MAX_POINTS);
+    MenuItem_static::draw(LCD_HEIGHT / 2, GET_TEXT_F(MSG_LEVEL_BED_NEXT_POINT), SS_CENTER, msg);
   }
   ui.refresh(LCDVIEW_CALL_NO_REDRAW);
   if (!ui.wait_for_move) ui.goto_screen(xatc_wizard_menu);
diff --git a/Marlin/src/lcd/tft/ui_color_ui.cpp b/Marlin/src/lcd/tft/ui_color_ui.cpp
index 85d310ca42ea..cefbd05d1953 100644
--- a/Marlin/src/lcd/tft/ui_color_ui.cpp
+++ b/Marlin/src/lcd/tft/ui_color_ui.cpp
@@ -429,7 +429,7 @@ void MenuEditItemBase::draw_edit_screen(FSTR_P const fstr, const char * const va
     }
   #endif
 
-  if (ui.can_show_slider()) {
+  if (ui.can_show_slider() && maxEditValue > 0) {
     tft.canvas((TFT_WIDTH - SLIDER_W) / 2, SLIDER_Y, SLIDER_W, 16);
     tft.set_background(COLOR_BACKGROUND);