diff --git a/meshroom/ui/qml/GraphEditor/Edge.qml b/meshroom/ui/qml/GraphEditor/Edge.qml index ba90a688..ef22386b 100644 --- a/meshroom/ui/qml/GraphEditor/Edge.qml +++ b/meshroom/ui/qml/GraphEditor/Edge.qml @@ -118,7 +118,7 @@ Item { anchors.centerIn: parent iconText: MaterialIcons.loop - label: (root.iteration + 1) + "/" + root.loopSize + " " + label.text: (root.iteration + 1) + "/" + root.loopSize + " " labelIconColor: palette.base ToolTip.text: "Foreach Loop" diff --git a/meshroom/ui/qml/MaterialIcons/MaterialToolLabel.qml b/meshroom/ui/qml/MaterialIcons/MaterialToolLabel.qml index 92b7be1c..ac927363 100644 --- a/meshroom/ui/qml/MaterialIcons/MaterialToolLabel.qml +++ b/meshroom/ui/qml/MaterialIcons/MaterialToolLabel.qml @@ -9,15 +9,19 @@ import QtQuick.Layouts Item { id: control + property alias icon: iconItem property alias iconText: iconItem.text property alias iconSize: iconItem.font.pointSize - property alias label: labelItem.text + property alias label: labelItem + property alias labelIconRow: contentRow property var labelIconColor: palette.text + property alias labelIconMouseArea: mouseArea implicitWidth: childrenRect.width implicitHeight: childrenRect.height anchors.rightMargin: 5 RowLayout { + id: contentRow Label { id: iconItem font.family: MaterialIcons.fontFamily diff --git a/meshroom/ui/qml/Viewer3D/Inspector3D.qml b/meshroom/ui/qml/Viewer3D/Inspector3D.qml index 43a08095..f35e0377 100644 --- a/meshroom/ui/qml/Viewer3D/Inspector3D.qml +++ b/meshroom/ui/qml/Viewer3D/Inspector3D.qml @@ -241,7 +241,7 @@ FloatingPane { MaterialToolLabel { iconText: MaterialIcons.stop - label: { + label.text: { var id = undefined // Ensure there are entries in resectionGroups and a valid resectionId before accessing anything if (Viewer3DSettings.resectionId !== undefined && Viewer3DSettings.resectionGroups && @@ -259,7 +259,7 @@ FloatingPane { MaterialToolLabel { iconText: MaterialIcons.auto_awesome_motion - label: { + label.text: { let currentCameras = 0 if (Viewer3DSettings.resectionGroups) { for (let i = 0; i <= Viewer3DSettings.resectionIdCount; i++) { @@ -277,7 +277,7 @@ FloatingPane { MaterialToolLabel { iconText: MaterialIcons.videocam - label: { + label.text: { let totalCameras = 0 if (Viewer3DSettings.resectionGroups) { for (let i = 0; i <= Viewer3DSettings.resectionIdCount; i++) {