Testing a hard exit

opengisch · Mar 19, 2024 · e0bc5f8 · e0bc5f8
1 parent 52355fe
commit e0bc5f8
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 4 deletions.
diff --git a/src/qml/WelcomeScreen.qml b/src/qml/WelcomeScreen.qml
@@ -766,6 +766,22 @@ Page {
     }
   }
 
+  QfToolButton {
+    id: exitButton
+    visible: false
+    anchors {
+      top: parent.top
+      right: parent.right
+      topMargin: mainWindow.sceneTopMargin
+    }
+    bgcolor: "red"
+
+    onClicked: {
+      mainWindow.closeAlreadyRequested = true
+      mainWindow.close()
+    }
+  }
+
   // Sparkles & unicorns
   Rectangle {
     anchors.fill: parent
@@ -872,6 +888,7 @@ Page {
     if (visible) {
       const currentProjectButtonVisible = !!qgisProject.fileName;
       currentProjectButton.visible = currentProjectButtonVisible
+      exitButton.visible = currentProjectButtonVisible
 
       if (firstShown) {
         welcomeText.text = " ";

diff --git a/src/qml/qgismobileapp.qml b/src/qml/qgismobileapp.qml
@@ -3908,7 +3908,7 @@ ApplicationWindow {
     state: iface.hasProjectOnLaunch() ? "visible" : "hidden"
   }
 
-  property bool alreadyCloseRequested: false
+  property bool closeAlreadyRequested: false
 
   onClosing: (close) => {
     if (screenLocker.enabled) {
@@ -3917,9 +3917,9 @@ ApplicationWindow {
        return
     }
 
-    if (!alreadyCloseRequested) {
+    if (!closeAlreadyRequested) {
       close.accepted = false
-      alreadyCloseRequested = true
+      closeAlreadyRequested = true
       displayToast(qsTr("Press back again to close project and app"))
       closingTimer.start()
     } else {
@@ -3931,7 +3931,7 @@ ApplicationWindow {
     id: closingTimer
     interval: 2000
     onTriggered: {
-        alreadyCloseRequested = false
+        closeAlreadyRequested = false
     }
   }