Popups can now have an handler. It could perhaps avoid another EEPROM format @3djc ?

2019-03-21 15:44:16 +01:00
parent 4de9e3f73b
commit d4b14f614c
21 changed files with 104 additions and 61 deletions
@@ -86,6 +86,8 @@ void showAlertBox(const char * title, const char * text, const char * action, ui

 void runPopupWarning(event_t event)
 {
+  warningResult = false;
+
  drawMessageBox(warningText);

  if (warningInfoText) {
@@ -99,12 +101,22 @@ void runPopupWarning(event_t event)
      if (warningType == WARNING_TYPE_ASTERISK)
        break;

-      if (warningType != WARNING_TYPE_INFO)
-        popupMenuHandler(STR_OK);
+      if (warningType == WARNING_TYPE_CONFIRM) {
+        warningType = WARNING_TYPE_ASTERISK;
+        warningText = nullptr;
+        warningResult = true;
+        if (popupMenuHandler)
+          popupMenuHandler(STR_OK);
+        break;
+      }
      // no break

    case EVT_KEY_BREAK(KEY_EXIT):
-      warningText = NULL;
+      if (warningType == WARNING_TYPE_CONFIRM) {
+        if (popupMenuHandler)
+          popupMenuHandler(STR_EXIT);
+      }
+      warningText = nullptr;
      warningType = WARNING_TYPE_ASTERISK;
      break;
  }