|
@@ -31,6 +31,10 @@ using namespace ExtUI;
|
31
|
31
|
|
32
|
32
|
constexpr static SpinnerDialogBoxData &mydata = screen_data.SpinnerDialogBox;
|
33
|
33
|
|
|
34
|
+void SpinnerDialogBox::onEntry() {
|
|
35
|
+ mydata.auto_hide = true;
|
|
36
|
+}
|
|
37
|
+
|
34
|
38
|
void SpinnerDialogBox::onRedraw(draw_mode_t) {
|
35
|
39
|
}
|
36
|
40
|
|
|
@@ -38,6 +42,7 @@ void SpinnerDialogBox::show(progmem_str message) {
|
38
|
42
|
drawMessage(message);
|
39
|
43
|
drawSpinner();
|
40
|
44
|
storeBackground();
|
|
45
|
+ GOTO_SCREEN(SpinnerDialogBox);
|
41
|
46
|
mydata.auto_hide = false;
|
42
|
47
|
}
|
43
|
48
|
|
|
@@ -48,16 +53,12 @@ void SpinnerDialogBox::hide() {
|
48
|
53
|
|
49
|
54
|
void SpinnerDialogBox::enqueueAndWait(progmem_str message, progmem_str commands) {
|
50
|
55
|
show(message);
|
51
|
|
- GOTO_SCREEN(SpinnerDialogBox);
|
52
|
56
|
ExtUI::injectCommands_P((const char*)commands);
|
53
|
|
- mydata.auto_hide = true;
|
54
|
57
|
}
|
55
|
58
|
|
56
|
59
|
void SpinnerDialogBox::enqueueAndWait(progmem_str message, char *commands) {
|
57
|
60
|
show(message);
|
58
|
|
- GOTO_SCREEN(SpinnerDialogBox);
|
59
|
61
|
ExtUI::injectCommands(commands);
|
60
|
|
- mydata.auto_hide = true;
|
61
|
62
|
}
|
62
|
63
|
|
63
|
64
|
void SpinnerDialogBox::onIdle() {
|