Toggle menus using press state

Author: tfourj

CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.16)
 
-project(Earie VERSION 1.1.1 LANGUAGES CXX)
+project(Earie VERSION 1.2.0 LANGUAGES CXX)
 
 set(TARGET_NAME Earie)
 

qml/Main.qml

@@ -92,6 +92,7 @@ Item {
                 Layout.preferredWidth: 28
                 Layout.preferredHeight: 28
                 padding: 0
+                property bool wasOpenOnPress: false
                 font.family: theme.iconFont
                 font.pixelSize: 14
                 text: theme.glyphSettings
@@ -101,7 +102,15 @@ Item {
                     color: settingsBtn.hovered ? theme.cellHover : "transparent"
                 }
 
-                onClicked: settingsMenu.open()
+                onPressed: wasOpenOnPress = settingsMenu.visible
+                onClicked: {
+                    if (wasOpenOnPress) {
+                        wasOpenOnPress = false
+                        settingsMenu.close()
+                        return
+                    }
+                    settingsMenu.open()
+                }
 
                 StyledMenu {
                     id: settingsMenu
@@ -200,6 +209,7 @@ Item {
                 Layout.preferredWidth: 28
                 Layout.preferredHeight: 28
                 padding: 0
+                property bool wasOpenOnPress: false
                 font.family: theme.iconFont
                 font.pixelSize: 14
                 text: theme.glyphEye
@@ -209,7 +219,15 @@ Item {
                     color: hiddenBtn.hovered ? theme.cellHover : "transparent"
                 }
 
-                onClicked: hiddenMenu.open()
+                onPressed: wasOpenOnPress = hiddenMenu.visible
+                onClicked: {
+                    if (wasOpenOnPress) {
+                        wasOpenOnPress = false
+                        hiddenMenu.close()
+                        return
+                    }
+                    hiddenMenu.open()
+                }
 
                 StyledMenu {
                     id: hiddenMenu

qml/components/StyledMenu.qml

@@ -8,7 +8,7 @@ Menu {
 
     padding: 6
     implicitWidth: 190
-    closePolicy: Popup.CloseOnPressOutside | Popup.CloseOnEscape
+    closePolicy: Popup.CloseOnReleaseOutside | Popup.CloseOnEscape
 
     onAboutToShow: if (appController) appController.popupOpened()
     onAboutToHide: if (appController) appController.popupClosed()