From da8412db6aaeadefdaab8afb44bb6ab5e027addb Mon Sep 17 00:00:00 2001
From: Marcio Teixeira <mlt4356-github@yahoo.com>
Date: Fri, 6 Aug 2021 10:05:52 -0600
Subject: [PATCH] Additional tweaks for FTDI Eve spinner dialog box

---
 .../generic/spinner_dialog_box.cpp            | 51 ++++++++++++++++---
 .../generic/spinner_dialog_box.h              |  4 +-
 2 files changed, 46 insertions(+), 9 deletions(-)

diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/spinner_dialog_box.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/spinner_dialog_box.cpp
index 47bb0eebdb..830a0238fe 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/spinner_dialog_box.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/spinner_dialog_box.cpp
@@ -26,45 +26,80 @@
 
 #ifdef FTDI_SPINNER_DIALOG_BOX
 
+#define GRID_COLS 2
+#define GRID_ROWS 8
+
 using namespace FTDI;
 using namespace ExtUI;
+using namespace Theme;
 
 constexpr static SpinnerDialogBoxData &mydata = screen_data.SpinnerDialogBox;
 
 void SpinnerDialogBox::onEntry() {
+  UIScreen::onEntry();
   mydata.auto_hide = true;
 }
 
+void SpinnerDialogBox::onExit() {
+  CommandProcessor cmd;
+  cmd.stop().execute();
+}
+
+void SpinnerDialogBox::onRefresh() {
+  using namespace FTDI;
+  DLCache dlcache(SPINNER_CACHE);
+  CommandProcessor cmd;
+  cmd.cmd(CMD_DLSTART);
+  if (dlcache.has_data())
+    dlcache.append();
+  else
+    dlcache.store(SPINNER_DL_SIZE);
+  cmd.spinner(BTN_POS(1,4), BTN_SIZE(2,3)).execute();
+}
+
 void SpinnerDialogBox::onRedraw(draw_mode_t) {
 }
 
 void SpinnerDialogBox::show(progmem_str message) {
-  drawMessage(message);
-  drawSpinner();
-  storeBackground();
-  GOTO_SCREEN(SpinnerDialogBox);
+  CommandProcessor cmd;
+  if (AT_SCREEN(SpinnerDialogBox)) cmd.stop().execute();
+  cmd.cmd(CMD_DLSTART)
+     .cmd(CLEAR_COLOR_RGB(bg_color))
+     .cmd(CLEAR(true,true,true))
+     .cmd(COLOR_RGB(bg_text_enabled))
+     .tag(0);
+  draw_text_box(cmd, BTN_POS(1,1), BTN_SIZE(2,3), message, OPT_CENTER, font_large);
+  DLCache dlcache(SPINNER_CACHE);
+  if (!dlcache.store(SPINNER_DL_SIZE)) {
+    SERIAL_ECHO_MSG("CachedScreen::storeBackground() failed: not enough DL cache space");
+    cmd.cmd(CMD_DLSTART).cmd(CLEAR(true,true,true));
+    dlcache.store(SPINNER_DL_SIZE);
+  }
+  if (AT_SCREEN(SpinnerDialogBox))
+    cmd.spinner(BTN_POS(1,4), BTN_SIZE(2,3)).execute();
+  else
+    GOTO_SCREEN(SpinnerDialogBox);
   mydata.auto_hide = false;
 }
 
 void SpinnerDialogBox::hide() {
-  CommandProcessor cmd;
-  cmd.stop().execute();
   GOTO_PREVIOUS();
 }
 
 void SpinnerDialogBox::enqueueAndWait(progmem_str message, progmem_str commands) {
   show(message);
   ExtUI::injectCommands_P((const char*)commands);
+  mydata.auto_hide = true;
 }
 
 void SpinnerDialogBox::enqueueAndWait(progmem_str message, char *commands) {
   show(message);
   ExtUI::injectCommands(commands);
+  mydata.auto_hide = true;
 }
 
 void SpinnerDialogBox::onIdle() {
-  reset_menu_timeout();
-  if (mydata.auto_hide && !commandsInQueue()) {
+  if (mydata.auto_hide && !commandsInQueue() && TERN1(HOST_KEEPALIVE_FEATURE, GcodeSuite::busy_state == GcodeSuite::NOT_BUSY)) {
     mydata.auto_hide = false;
     hide();
   }
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/spinner_dialog_box.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/spinner_dialog_box.h
index 4a561980c0..23e31d1a91 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/spinner_dialog_box.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/spinner_dialog_box.h
@@ -29,10 +29,12 @@ struct SpinnerDialogBoxData {
   bool auto_hide;
 };
 
-class SpinnerDialogBox : public DialogBoxBaseClass, public CachedScreen<SPINNER_CACHE,SPINNER_DL_SIZE> {
+class SpinnerDialogBox : public UIScreen {
   public:
     static void onEntry();
+    static void onExit();
     static void onRedraw(draw_mode_t);
+    static void onRefresh();
     static void onIdle();
 
     static void show(progmem_str);