3pp-mirror/Meshroom
1
0
Fork 0
mirror of https://github.com/alicevision/Meshroom.git synced 2025-06-14 00:31:58 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2627 from alicevision/fix/jsParamInjection

Browse source 
[GraphEditor] Fix injections into signal handlers with JS functions
This commit is contained in:
Fabien Castan 2025-01-06 15:14:39 +01:00 • committed by GitHub
commit e43cd62f79
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
meshroom/ui/qml/GraphEditor/AttributeItemDelegate.qml
View file

@ -103,7 +103,7 @@ RowLayout {
anchors.fill: parent anchors.fill: parent
hoverEnabled: true hoverEnabled: true
acceptedButtons: Qt.AllButtons acceptedButtons: Qt.AllButtons
onDoubleClicked: root.doubleClicked(mouse, root.attribute) onDoubleClicked: function(mouse) { root.doubleClicked(mouse, root.attribute) }
property Component menuComp: Menu { property Component menuComp: Menu {
id: paramMenu id: paramMenu

4
meshroom/ui/qml/GraphEditor/NodeEditor.qml
View file

@ -298,7 +298,7 @@ Panel {
Layout.fillWidth: true Layout.fillWidth: true
model: root.node.attributes model: root.node.attributes
readOnly: root.readOnly || root.isCompatibilityNode readOnly: root.readOnly || root.isCompatibilityNode
onAttributeDoubleClicked: root.attributeDoubleClicked(mouse, attribute) onAttributeDoubleClicked: function(mouse, attribute) { root.attributeDoubleClicked(mouse, attribute) }
onUpgradeRequest: root.upgradeRequest() onUpgradeRequest: root.upgradeRequest()
filterText: searchBar.text filterText: searchBar.text
} }
@ -365,7 +365,7 @@ Panel {
Layout.fillWidth: true Layout.fillWidth: true
model: root.node.internalAttributes model: root.node.internalAttributes
readOnly: root.readOnly || root.isCompatibilityNode readOnly: root.readOnly || root.isCompatibilityNode
onAttributeDoubleClicked: root.attributeDoubleClicked(mouse, attribute) onAttributeDoubleClicked: function(mouse, attribute) { root.attributeDoubleClicked(mouse, attribute) }
onUpgradeRequest: root.upgradeRequest() onUpgradeRequest: root.upgradeRequest()
filterText: searchBar.text filterText: searchBar.text
} }

6
meshroom/ui/qml/GraphEditor/ScriptEditor.qml
View file

@ -118,7 +118,7 @@ Item {
ToolTip.text: "Execute Script" ToolTip.text: "Execute Script"
onClicked: { onClicked: {
processScript() root.processScript()
} }
} }
@ -285,9 +285,9 @@ Item {
root.forceActiveFocus() root.forceActiveFocus()
} }
Keys.onPressed: { Keys.onPressed: function(event) {
if ((event.key === Qt.Key_Enter || event.key === Qt.Key_Return) && event.modifiers === Qt.ControlModifier) { if ((event.key === Qt.Key_Enter || event.key === Qt.Key_Return) && event.modifiers === Qt.ControlModifier) {
processScript() root.processScript()
} }
} }
} }