Browse Source

🐛 Fix FTDI Eve Touch UI (#22530)

Marcio T 3 years ago
parent
commit
26b1ed7c2a
No account linked to committer's email address

+ 1
- 1
Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/adjuster_widget.cpp View File

42
       strcat_P(str, (const char*) units);
42
       strcat_P(str, (const char*) units);
43
     }
43
     }
44
 
44
 
45
-    cmd.text(VAL_POS, str);
45
+    cmd.tag(0).text(VAL_POS, str);
46
   }
46
   }
47
 
47
 
48
   void draw_adjuster(CommandProcessor& cmd, int16_t x, int16_t y, int16_t w, int16_t h, uint8_t tag, float value, progmem_str units, int8_t width, uint8_t precision, draw_mode_t what) {
48
   void draw_adjuster(CommandProcessor& cmd, int16_t x, int16_t y, int16_t w, int16_t h, uint8_t tag, float value, progmem_str units, int8_t width, uint8_t precision, draw_mode_t what) {

+ 2
- 1
Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/spinner_dialog_box.cpp View File

36
 constexpr static SpinnerDialogBoxData &mydata = screen_data.SpinnerDialogBox;
36
 constexpr static SpinnerDialogBoxData &mydata = screen_data.SpinnerDialogBox;
37
 
37
 
38
 void SpinnerDialogBox::onEntry() {
38
 void SpinnerDialogBox::onEntry() {
39
+  UIScreen::onEntry();
39
   mydata.auto_hide = true;
40
   mydata.auto_hide = true;
40
 }
41
 }
41
 
42
 
98
 }
99
 }
99
 
100
 
100
 void SpinnerDialogBox::onIdle() {
101
 void SpinnerDialogBox::onIdle() {
101
-  if (mydata.auto_hide && !commandsInQueue()) {
102
+  if (mydata.auto_hide && !commandsInQueue() && TERN1(HOST_KEEPALIVE_FEATURE, GcodeSuite::busy_state == GcodeSuite::NOT_BUSY)) {
102
     mydata.auto_hide = false;
103
     mydata.auto_hide = false;
103
     hide();
104
     hide();
104
   }
105
   }

+ 1
- 1
Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/spinner_dialog_box.h View File

29
   bool auto_hide;
29
   bool auto_hide;
30
 };
30
 };
31
 
31
 
32
-class SpinnerDialogBox : public BaseScreen {
32
+class SpinnerDialogBox : public UIScreen {
33
   public:
33
   public:
34
     static void onEntry();
34
     static void onEntry();
35
     static void onExit();
35
     static void onExit();

Loading…
Cancel
Save