Merge pull request #26679 from krasko78/26665-ToolbarButtonsDoNotReactToLongClicks

26665: Toolbar buttons do not react to long clicks

Author: cbjeukendrup

src/framework/uicomponents/qml/Muse/UiComponents/FlatButton.qml

@@ -103,8 +103,9 @@ FocusScope {
     }
 
     signal clicked(var mouse)
-    // There are intentionally no "forwarded" signals here from the MouseArea, like `pressAndHold`
-    // See https://github.com/musescore/MuseScore/issues/16012#issuecomment-1399656043
+    // The `pressAndHold` signal is intentionally not "forwarded" here from the MouseArea for performance reasons.
+    // Most buttons don't use it and Qt has optimizations if no signal is attached. If a component needs it,
+    // it can hook to it directly (the mouse area is exposed via the `mouseArea` alias property).
 
     objectName: root.text
 

src/framework/uicomponents/qml/Muse/UiComponents/StyledToolBarItem.qml

@@ -103,18 +103,13 @@ FlatButton {
         }
     }
 
-    Connections {
-        target: root.mouseArea
-
-        enabled: root.hasMenu && !menuLoader.isMenuOpened
-
-        function onPressAndHold() {
-            if (menuLoader.isMenuOpened || !root.hasMenu) {
-                return
-            }
-
-            root.toggleMenuOpened()
+    mouseArea.onPressAndHold: function(event) {
+        if (menuLoader.isMenuOpened || !root.hasMenu) {
+            event.accepted = false // do not suppress the click event
+            return
         }
+
+        root.toggleMenuOpened()
     }
 
     Canvas {

src/notation/qml/MuseScore/NotationScene/NoteInputBar.qml

@@ -155,20 +155,13 @@ Item {
                 }
             }
 
-            Connections {
-                target: btn.mouseArea
-
-                // Make sure we only connect to `pressAndHold` if necessary
-                // See https://github.com/musescore/MuseScore/issues/16012
-                enabled: btn.hasMenu && !menuLoader.isMenuOpened
-
-                function onPressAndHold() {
-                    if (menuLoader.isMenuOpened || !btn.hasMenu) {
-                        return
-                    }
-
-                    btn.toggleMenuOpened()
+            mouseArea.onPressAndHold: function(event) {
+                if (menuLoader.isMenuOpened || !btn.hasMenu) {
+                    event.accepted = false // do not suppress the click event
+                    return
                 }
+
+                btn.toggleMenuOpened()
             }
 
             StyledMenuLoader {