Allow validation error stacking

mavlink · Dec 29, 2024 · 5a90551 · 5a90551
1 parent c20029c
commit 5a90551
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/QmlControls/QGCPopupDialog.qml b/src/QmlControls/QGCPopupDialog.qml
@@ -66,6 +66,7 @@ Popup {
     property real   _contentMargin:     ScreenTools.defaultFontPixelHeight / 2
     property bool   _acceptAllowed:     acceptButton.visible
     property bool   _rejectAllowed:     rejectButton.visible
+    property int    _previousValidationErrorCount: 0
 
     background: QGCMouseArea {
         width:  mainWindow.width
@@ -84,16 +85,21 @@ Popup {
         contentChildren[contentChildren.length - 1].parent = dialogContentParent
     }
 
-    onAboutToShow: setupDialogButtons(buttons)
+    onAboutToShow: {
+        _previousValidationErrorCount = globals.validationErrorCount
+        setupDialogButtons(buttons)
+    }
+
     onClosed: {
+        globals.validationErrorCount = _previousValidationErrorCount
         Qt.inputMethod.hide()
         if (destroyOnClose) {
             root.destroy()
         }
     }
 
     function _accept() {
-        if (_acceptAllowed && mainWindow.allowViewSwitch()) {
+        if (_acceptAllowed && mainWindow.allowViewSwitch(_previousValidationErrorCount)) {
             accepted()
             if (preventClose) {
                 preventClose = false
@@ -105,7 +111,7 @@ Popup {
 
     function _reject() {
         // Dialogs with cancel button are allowed to close with validation errors
-        if (_rejectAllowed && ((buttons & Dialog.Cancel) || mainWindow.allowViewSwitch())) {
+        if (_rejectAllowed && ((buttons & Dialog.Cancel) || mainWindow.allowViewSwitch(_previousValidationErrorCount))) {
             rejected()
             if (preventClose) {
                 preventClose = false

diff --git a/src/UI/MainRootWindow.qml b/src/UI/MainRootWindow.qml
@@ -111,12 +111,12 @@ ApplicationWindow {
     //-- Global Scope Functions
 
     // This function is used to prevent view switching if there are validation errors
-    function allowViewSwitch() {
+    function allowViewSwitch(previousValidationErrorCount = 0) {
         // Run validation on active focus control to ensure it is valid before switching views
         if (mainWindow.activeFocusControl instanceof QGCTextField) {
             mainWindow.activeFocusControl.onEditingFinished()
         }
-        return globals.validationErrorCount === 0
+        return globals.validationErrorCount <= previousValidationErrorCount
     }
 
     function showPlanView() {