Merge pull request #2627 from alicevision/fix/jsParamInjection

[GraphEditor] Fix injections into signal handlers with JS functions
alicevision · Jan 6, 2025 · e43cd62 · e43cd62
2 parents f8f549a + cb301b2
commit e43cd62
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/meshroom/ui/qml/GraphEditor/AttributeItemDelegate.qml b/meshroom/ui/qml/GraphEditor/AttributeItemDelegate.qml
@@ -103,7 +103,7 @@ RowLayout {
                     anchors.fill: parent
                     hoverEnabled: true
                     acceptedButtons: Qt.AllButtons
-                    onDoubleClicked: root.doubleClicked(mouse, root.attribute)
+                    onDoubleClicked: function(mouse) { root.doubleClicked(mouse, root.attribute) }
 
                     property Component menuComp: Menu {
                         id: paramMenu

diff --git a/meshroom/ui/qml/GraphEditor/NodeEditor.qml b/meshroom/ui/qml/GraphEditor/NodeEditor.qml
@@ -298,7 +298,7 @@ Panel {
                             Layout.fillWidth: true
                             model: root.node.attributes
                             readOnly: root.readOnly || root.isCompatibilityNode
-                            onAttributeDoubleClicked: root.attributeDoubleClicked(mouse, attribute)
+                            onAttributeDoubleClicked: function(mouse, attribute) { root.attributeDoubleClicked(mouse, attribute) }
                             onUpgradeRequest: root.upgradeRequest()
                             filterText: searchBar.text
                         }
@@ -365,7 +365,7 @@ Panel {
                             Layout.fillWidth: true
                             model: root.node.internalAttributes
                             readOnly: root.readOnly || root.isCompatibilityNode
-                            onAttributeDoubleClicked: root.attributeDoubleClicked(mouse, attribute)
+                            onAttributeDoubleClicked: function(mouse, attribute) { root.attributeDoubleClicked(mouse, attribute) }
                             onUpgradeRequest: root.upgradeRequest()
                             filterText: searchBar.text
                         }

diff --git a/meshroom/ui/qml/GraphEditor/ScriptEditor.qml b/meshroom/ui/qml/GraphEditor/ScriptEditor.qml
@@ -118,7 +118,7 @@ Item {
                 ToolTip.text: "Execute Script"
 
                 onClicked: {
-                    processScript()
+                    root.processScript()
                 }
             }
 
@@ -285,9 +285,9 @@ Item {
                             root.forceActiveFocus()
                         }
 
-                        Keys.onPressed: {
+                        Keys.onPressed: function(event) {
                             if ((event.key === Qt.Key_Enter || event.key === Qt.Key_Return) && event.modifiers === Qt.ControlModifier) {
-                                processScript()
+                                root.processScript()
                             }
                         }
                     }