fix: app doesn't close to tray when [x] is pressed

caybro · caybro · commit b4ce19bc646c · 2025-11-28T16:08:28.000+01:00
- hide the window instead of minimizing (except when on macOS or mobile) - hide the advanced "Minimize to tray icon on close" option, making the copy explicitly mention the "tray icon" - fix some runtime warnings Fixes #19364
diff --git a/storybook/main.cpp b/storybook/main.cpp
@@ -142,7 +142,8 @@ int main(int argc, char *argv[])
     qInfo() << "Storybook started, Qt runtime version:" << qVersion()
             << "; built against version:" << QLibraryInfo::version().toString()
             << "installed in:" << QLibraryInfo::path(QLibraryInfo::PrefixPath)
-            << "; QQC style:" << QQuickStyle::name();
+            << "; QQC style:" << QQuickStyle::name()
+            << "; QPA:" << qApp->platformName();
 
     return QGuiApplication::exec();
 }
diff --git a/ui/app/AppLayouts/Profile/ProfileLayout.qml b/ui/app/AppLayouts/Profile/ProfileLayout.qml
@@ -78,6 +78,7 @@ StatusSectionLayout {
     property bool isKeycardEnabled: true
     property bool isBrowserEnabled: true
     required property bool privacyModeFeatureEnabled
+    required property bool minimizeOnCloseOptionVisible
 
     property var mutualContactsModel
     property var blockedContactsModel
@@ -461,6 +462,7 @@ StatusSectionLayout {
                 walletStore: root.walletStore
                 isFleetSelectionEnabled: fleetSelectionEnabled
                 isBrowserEnabled: root.isBrowserEnabled
+                minimizeOnCloseOptionVisible: root.minimizeOnCloseOptionVisible
                 sectionTitle: settingsEntriesModel.getNameForSubsection(Constants.settingsSubsection.advanced)
                 contentWidth: d.contentWidth
             }
diff --git a/ui/app/AppLayouts/Profile/views/AdvancedView.qml b/ui/app/AppLayouts/Profile/views/AdvancedView.qml
@@ -38,6 +38,7 @@ SettingsContentBase {
 
     property bool isFleetSelectionEnabled
     property bool isBrowserEnabled: true
+    property bool minimizeOnCloseOptionVisible
 
     Item {
         id: advancedContainer
@@ -73,7 +74,8 @@ SettingsContentBase {
 
             StatusSettingsLineButton {
                 width: parent.width
-                text: qsTr("Minimize on close")
+                visible: root.minimizeOnCloseOptionVisible
+                text: qsTr("Minimize to tray icon on close")
                 isSwitch: true
                 checked: !localAccountSensitiveSettings.quitOnClose
                 onToggled: localAccountSensitiveSettings.quitOnClose = !checked
diff --git a/ui/app/AppLayouts/Wallet/popups/AddEditSavedAddressPopup.qml b/ui/app/AppLayouts/Wallet/popups/AddEditSavedAddressPopup.qml
@@ -1,4 +1,5 @@
 import QtQuick
+import QtQuick.Controls // for Popup.xxx
 
 import StatusQ.Components
 import StatusQ.Controls
@@ -389,7 +390,7 @@ StatusDialog {
                 input.rightPadding: 16
                 input.tabNavItem: addressInput
 
-                onKeyPressed: {
+                onKeyPressed: event => {
                     d.submit(event)
                 }
             }
diff --git a/ui/app/AppLayouts/Wallet/views/LeftTabView.qml b/ui/app/AppLayouts/Wallet/views/LeftTabView.qml
@@ -111,7 +111,7 @@ Rectangle {
                 removeAccountConfirmation.active = true
             }
 
-            onHideFromTotalBalanceClicked: {
+            onHideFromTotalBalanceClicked: function (hideFromTotalBalance) {
                 if (!account)
                     return
                 RootStore.updateWatchAccountHiddenFromTotalBalance(account.address, hideFromTotalBalance)
@@ -305,7 +305,7 @@ Rectangle {
                     errorMode: networkConnectionStore.accountBalanceNotAvailable
                     errorIcon.tooltip.maxWidth: 300
                     errorIcon.tooltip.text: networkConnectionStore.accountBalanceNotAvailableText
-                    onClicked: {
+                    onClicked: function(itemId, mouse) {
                         if (mouse.button === Qt.RightButton) {
                             walletAccountContextMenu.active = true
                             walletAccountContextMenu.item.account = model
diff --git a/ui/app/mainui/AppMain.qml b/ui/app/mainui/AppMain.qml
@@ -139,6 +139,8 @@ Item {
 
     required property bool isCentralizedMetricsEnabled
 
+    required property bool systemTrayIconAvailable
+
     function showEnableBiometricsFlow() {
         popupRequestsHandler.enableBiometricsPopupHandler.openPopup()
     }
@@ -2137,6 +2139,7 @@ Item {
                         isKeycardEnabled: featureFlagsStore.keycardEnabled
                         isBrowserEnabled: featureFlagsStore.browserEnabled
                         privacyModeFeatureEnabled: featureFlagsStore.privacyModeFeatureEnabled
+                        minimizeOnCloseOptionVisible: appMain.systemTrayIconAvailable
 
                         theme: appMainLocalSettings.theme
                         fontSize: appMainLocalSettings.fontSize
diff --git a/ui/i18n/qml_base_en.ts b/ui/i18n/qml_base_en.ts
@@ -1195,7 +1195,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Minimize on close</source>
+        <source>Minimize to tray icon on close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/ui/i18n/qml_base_lokalise_en.ts b/ui/i18n/qml_base_lokalise_en.ts
@@ -1459,9 +1459,9 @@
       <translation>System</translation>
     </message>
     <message>
-      <source>Minimize on close</source>
+      <source>Minimize to tray icon on close</source>
       <comment>AdvancedView</comment>
-      <translation>Minimize on close</translation>
+      <translation>Minimize to tray icon on close</translation>
     </message>
     <message>
       <source>Mainnet data verified by Nimbus</source>
diff --git a/ui/i18n/qml_cs.ts b/ui/i18n/qml_cs.ts
@@ -1198,7 +1198,7 @@
         <translation type="unfinished">Systémový</translation>
     </message>
     <message>
-        <source>Minimize on close</source>
+        <source>Minimize to tray icon on close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/ui/i18n/qml_es.ts b/ui/i18n/qml_es.ts
@@ -1195,8 +1195,8 @@
         <translation>Sistema</translation>
     </message>
     <message>
-        <source>Minimize on close</source>
-        <translation>Minimizar al cerrar</translation>
+        <source>Minimize to tray icon on close</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mainnet data verified by Nimbus</source>
diff --git a/ui/i18n/qml_ko.ts b/ui/i18n/qml_ko.ts
@@ -1192,8 +1192,8 @@
         <translation>시스템</translation>
     </message>
     <message>
-        <source>Minimize on close</source>
-        <translation>닫을 때 최소화</translation>
+        <source>Minimize to tray icon on close</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mainnet data verified by Nimbus</source>
diff --git a/ui/imports/shared/views/AssetsViewAdaptor.qml b/ui/imports/shared/views/AssetsViewAdaptor.qml
@@ -108,7 +108,7 @@ QObject {
 
             readonly property bool marketDetailsAvailable: !hasCommunityId
             readonly property bool marketDetailsLoading: model.detailsLoading
-            readonly property real marketPrice: marketDetails.currencyPrice.amount ?? 0
+            readonly property real marketPrice: marketDetails.currencyPrice?.amount ?? 0
             readonly property real marketChangePct24hour: marketDetails.changePct24hour ?? 0
 
             readonly property bool visible: {
diff --git a/ui/imports/shared/views/SyncingEnterCode.qml b/ui/imports/shared/views/SyncingEnterCode.qml
@@ -37,7 +37,6 @@ ColumnLayout {
 
         StatusSwitchTabBar {
             Layout.fillWidth: true
-            Layout.leftMargin: betaTag.visible ? betaTag.width : 0
             id: switchTabBar
 
             currentIndex: 0
diff --git a/ui/main.qml b/ui/main.qml
@@ -61,9 +61,9 @@ Window {
     // Both Android and iOS keyboard heights are in physical pixels and need devicePixelRatio conversion
     // iOS: Native code converts (nativePoints × nativeScale) to pixels for Qt to convert to its logical points
     // Android: WindowInsets provides pixels directly
-    property real keyboardHeight: SQUtils.Utils.isAndroid ? SystemUtils.androidKeyboardHeight / Screen.devicePixelRatio :
-                                    SQUtils.Utils.isIOS ? SystemUtils.iosKeyboardHeight / Screen.devicePixelRatio :
-                                    Qt.inputMethod.visible ? Qt.inputMethod.keyboardRectangle.height : 0
+    readonly property real keyboardHeight: SQUtils.Utils.isAndroid ? SystemUtils.androidKeyboardHeight / Screen.devicePixelRatio :
+                                                                     SQUtils.Utils.isIOS ? SystemUtils.iosKeyboardHeight / Screen.devicePixelRatio :
+                                                                                           Qt.inputMethod.visible ? Qt.inputMethod.keyboardRectangle.height : 0
     
     // Calculate additional margin so that total = max(nativeSafeAreaBottom, keyboardHeight)
     // When keyboard shows, we want the keyboard height to replace the native safe area, not add to it
@@ -90,7 +90,6 @@ Window {
         Qt.application.version = aboutModule.getCurrentVersion()
         return Qt.application.displayName
     }
-    visible: false
 
     flags: Qt.platform.os === SQUtils.Utils.windows ? Qt.Window // extending the content in title is buggy on Windows
               : Qt.ExpandedClientAreaHint | Qt.NoTitleBarBackgroundHint
@@ -106,7 +105,6 @@ Window {
         if (SQUtils.Utils.isAndroid) {
             SystemUtils.setAndroidSplashScreenReady()
         }
-        applicationWindow.visible = true
     }
 
     function restoreAppState() {
@@ -132,8 +130,8 @@ Window {
 
             geometry = Qt.rect(0,
                                0,
-                               Math.min(Screen.desktopAvailableWidth - 125, 1400),
-                               Math.min(Screen.desktopAvailableHeight - 125, 840));
+                               Math.min(Screen.desktopAvailableWidth - 125, Theme.portraitBreakpoint.width),
+                               Math.min(Screen.desktopAvailableHeight - 125, Theme.portraitBreakpoint.height));
             geometry.x = (screen.width - geometry.width) / 2;
             geometry.y = (screen.height - geometry.height) / 2;
         }
@@ -167,9 +165,7 @@ Window {
         }
     }
 
-    onWidthChanged: {
-        Qt.callLater(storeAppState)
-    }
+    onWidthChanged: Qt.callLater(storeAppState)
     onHeightChanged: Qt.callLater(storeAppState)
 
     QtObject {
@@ -307,10 +303,14 @@ Window {
             }
         }
         function onClosing(close) {
-            // In case of android, we need to handle moveTaskToBackground explicitly
-            if (SQUtils.Utils.isAndroid) {
+            // on mobile, we minimize to background (no tray icon or quitOnClose setting)
+            if (SQUtils.Utils.isMobile) {
                 close.accepted = false
-                SystemUtils.androidMinimizeToBackground()
+                // In case of android, we need to handle moveTaskToBackground explicitly
+                if (SQUtils.Utils.isAndroid)
+                    SystemUtils.androidMinimizeToBackground()
+                else
+                    applicationWindow.showMinimized()
             // In case not logged in or loading, quit app
             } else if (loader.sourceComponent != app) {
                 close.accepted = true
@@ -320,23 +320,31 @@ Window {
                 close.accepted = true
             }
             else {
-                // The app is already minimized. The user really wants to quit the app
+                // The window is already hidden or minimized.
                 // The user really wants to quit the app
-                if (applicationWindow.visibility === Window.Minimized) {
+                if (applicationWindow.visibility === Window.Minimized || applicationWindow.visibility === Window.Hidden) {
                     close.accepted = true
                     return
                 }
 
-                close.accepted = false
                 /* In case of mac in fullscreen mode, hiding the window leads to black screen.
                 Hence we exit Fullscreen on system close and then the user can perform an actual
                 hide of the app */
                 if(applicationWindow.visibility === Window.FullScreen &&
                         Qt.platform.os === SQUtils.Utils.mac) {
+                    close.accepted = false
                     applicationWindow.showNormal()
                     return
                 }
-                applicationWindow.showMinimized()
+
+                // hide the window into the tray, if available; quit otherwise
+                if (systemTray.available) {
+                    close.accepted = false
+                    // WRN 2025-11-26 <snip> file=qrc:/main.qml:26 text="QML QQuickWindowQmlImpl*: Conflicting properties 'visible' and 'visibility'"
+                    applicationWindow.visibility = Window.Hidden
+                } else {
+                    close.accepted = true
+                }
             }
         }
     }
@@ -374,7 +382,7 @@ Window {
 
     Component.onCompleted: {
         
-        console.info(">>> %1 %2 started, using Qt version %3".arg(Qt.application.name).arg(Qt.application.version).arg(SystemUtils.qtRuntimeVersion()))
+        console.info(">>> %1 %2 started, using Qt version %3, QPA: %4".arg(Application.name).arg(Application.version).arg(SystemUtils.qtRuntimeVersion()).arg(Qt.platform.pluginName))
 
         if (languageStore.currentLanguage === "") { // if we haven't configured the language yet...
             // ...and we have a translation for it
@@ -483,6 +491,8 @@ Window {
             visible: !startupOnboardingLoader.active
             isCentralizedMetricsEnabled: metricsStore.isCentralizedMetricsEnabled
 
+            systemTrayIconAvailable: systemTray.available
+
             keychain: appKeychain
             Component.onCompleted: {
                 applicationWindow.contentLoaded()

Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,8 @@ int main(int argc, char *argv[])`
`142`	`142`	`qInfo() << "Storybook started, Qt runtime version:" << qVersion()`
`143`	`143`	`<< "; built against version:" << QLibraryInfo::version().toString()`
`144`	`144`	`<< "installed in:" << QLibraryInfo::path(QLibraryInfo::PrefixPath)`
`145`		`- << "; QQC style:" << QQuickStyle::name();`
	`145`	`+ << "; QQC style:" << QQuickStyle::name()`
	`146`	`+ << "; QPA:" << qApp->platformName();`
`146`	`147`
`147`	`148`	`return QGuiApplication::exec();`
`148`	`149`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`import QtQuick`
	`2`	`+import QtQuick.Controls // for Popup.xxx`
`2`	`3`
`3`	`4`	`import StatusQ.Components`
`4`	`5`	`import StatusQ.Controls`
`@@ -389,7 +390,7 @@ StatusDialog {`
`389`	`390`	`input.rightPadding: 16`
`390`	`391`	`input.tabNavItem: addressInput`
`391`	`392`
`392`		`- onKeyPressed: {`
	`393`	`+ onKeyPressed: event => {`
`393`	`394`	`d.submit(event)`
`394`	`395`	`}`
`395`	`396`	`}`