From 5e2723581d634f5f21a7de739d19df0fab6ceba1 Mon Sep 17 00:00:00 2001 From: Andrzej Biniek Date: Thu, 26 Dec 2024 22:31:49 +0100 Subject: [PATCH] Fix texture node Texture node displays data correctly Change-Id: I075230d2640be7a832c4e4cbdf798aa5148e7267 Reviewed-by: spyro-adb --- .../nodegrapheditor/imports/Nodes/ComboBox.qml | 11 +++++------ .../nodegrapheditor/imports/Nodes/Texture.qml | 14 +++++++++++++- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/share/qtcreator/qmldesigner/nodegrapheditor/imports/Nodes/ComboBox.qml b/share/qtcreator/qmldesigner/nodegrapheditor/imports/Nodes/ComboBox.qml index 7e8195329a0..d9e5893c748 100644 --- a/share/qtcreator/qmldesigner/nodegrapheditor/imports/Nodes/ComboBox.qml +++ b/share/qtcreator/qmldesigner/nodegrapheditor/imports/Nodes/ComboBox.qml @@ -12,11 +12,7 @@ Base { id: root property QtObject value: QtObject { - property url text: `image://qmldesigner_nodegrapheditor/${comboBox.currentValue}` - - onTextChanged: { - NodeGraphEditorBackend.nodeGraphEditorModel.hasUnsavedChanges = true; - } + property url text: `image://qmldesigner_nodegrapheditor/${comboBox.currentValue}` } Layout.preferredWidth: 175 @@ -53,7 +49,10 @@ Base { model: fileModel.model textRole: "fileName" valueRole: "relativeFilePath" - + onCurrentValueChanged: { + NodeGraphEditorBackend.nodeGraphEditorModel.hasUnsavedChanges = true; + root.value.text = `image://qmldesigner_nodegrapheditor/${currentValue}` + } // valueRole: "absoluteFilePath" // model: [ diff --git a/share/qtcreator/qmldesigner/nodegrapheditor/imports/Nodes/Texture.qml b/share/qtcreator/qmldesigner/nodegrapheditor/imports/Nodes/Texture.qml index fb92b0e6a24..d6c5bb5c5e9 100644 --- a/share/qtcreator/qmldesigner/nodegrapheditor/imports/Nodes/Texture.qml +++ b/share/qtcreator/qmldesigner/nodegrapheditor/imports/Nodes/Texture.qml @@ -15,6 +15,7 @@ Base { readonly property QtQuick3D.Texture reset: QtQuick3D.Texture { } + property alias source: root.value.source readonly property QtQuick3D.Texture value: QtQuick3D.Texture { } @@ -22,6 +23,18 @@ Base { Layout.preferredWidth: 150 type: "Texture" + portsMetaData: QtObject { + property var pin: [ + { + id: "texture_in_source", + alias: "source", + name: "Source", + type: "QUrl" + }, + ] + property var pout: [] + } + Component.onCompleted: { node.label = "Texture"; internal.configurePorts(root.graph); @@ -34,7 +47,6 @@ Base { anchors.centerIn: parent height: 96 source: root.value.source - // source: `image://qmldesigner_nodegrapheditor/${root.value.source}` width: 96 }