From b6a2a3eead4dea2c5974e6448dedd36611a247dd Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Wed, 17 Jul 2024 03:45:06 +1200
Subject: [PATCH] fix for TFT_CLASSIC_UI

---
 Marlin/src/lcd/dogm/u8g/u8g_dev_tft_upscale_from_128x64.cpp | 5 -----
 Marlin/src/lcd/tft/ui_common.cpp                            | 5 +++++
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Marlin/src/lcd/dogm/u8g/u8g_dev_tft_upscale_from_128x64.cpp b/Marlin/src/lcd/dogm/u8g/u8g_dev_tft_upscale_from_128x64.cpp
index 36baf490d3..e458c8e4c4 100644
--- a/Marlin/src/lcd/dogm/u8g/u8g_dev_tft_upscale_from_128x64.cpp
+++ b/Marlin/src/lcd/dogm/u8g/u8g_dev_tft_upscale_from_128x64.cpp
@@ -517,11 +517,6 @@ U8G_PB_DEV(u8g_dev_tft_320x240_upscale_from_128x64, WIDTH, HEIGHT, PAGE_HEIGHT,
 
     FSTR_P str = nullptr;
     if (stage < CALIBRATION_SUCCESS) {
-      tft_string.set(GET_TEXT(MSG_TOUCH_CALIBRATION));
-      tft.canvas(0, 0, TFT_WIDTH, tft_string.font_height());
-      tft.set_background(COLOR_BACKGROUND);
-      tft.add_text(tft_string.center(TFT_WIDTH), 0, COLOR_MENU_TEXT, tft_string);
-
       // handle current state
       switch (stage) {
         case CALIBRATION_TOP_LEFT:     str = GET_TEXT_F(MSG_TOP_LEFT);     break;
diff --git a/Marlin/src/lcd/tft/ui_common.cpp b/Marlin/src/lcd/tft/ui_common.cpp
index 78eae61062..d71c90ed5b 100644
--- a/Marlin/src/lcd/tft/ui_common.cpp
+++ b/Marlin/src/lcd/tft/ui_common.cpp
@@ -456,6 +456,11 @@ void MarlinUI::clear_for_drawing() { clear_lcd(); }
     touch.clear();
 
     if (stage < CALIBRATION_SUCCESS) {
+      tft_string.set(GET_TEXT(MSG_TOUCH_CALIBRATION));
+      tft.canvas(0, 0, TFT_WIDTH, tft_string.font_height());
+      tft.set_background(COLOR_BACKGROUND);
+      tft.add_text(tft_string.center(TFT_WIDTH), 0, COLOR_MENU_TEXT, tft_string);
+
       switch (stage) {
         case CALIBRATION_TOP_LEFT:     tft_string.set(GET_TEXT(MSG_TOP_LEFT));     break;
         case CALIBRATION_TOP_RIGHT:    tft_string.set(GET_TEXT(MSG_TOP_RIGHT));    break;