From 37dc9e5dcb7b37c9959eb91af6945cfc644511f9 Mon Sep 17 00:00:00 2001 From: Saumya Jain Date: Mon, 18 Mar 2024 14:47:24 +0100 Subject: [PATCH] Update UI layering and MachineSelector properties in 3MFReader The z-index property of combobox and Loader elements in WorkspaceSection.qml was adjusted to ensure proper layering. CURA-11700 --- plugins/3MFReader/WorkspaceDialog.qml | 11 +++-------- plugins/3MFReader/WorkspaceSection.qml | 8 ++++++-- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/plugins/3MFReader/WorkspaceDialog.qml b/plugins/3MFReader/WorkspaceDialog.qml index ac72f92187..878b80db17 100644 --- a/plugins/3MFReader/WorkspaceDialog.qml +++ b/plugins/3MFReader/WorkspaceDialog.qml @@ -116,17 +116,12 @@ UM.Dialog comboboxTitle: catalog.i18nc("@action:label", "Open With") comboboxTooltipText: catalog.i18nc("@info:tooltip", "Printer settings will be updated to match the settings saved with the project.") comboboxVisible: workspaceDialog.visible && manager.updatableMachinesModel.count > 1 - Cura.MachineSelector + combobox: Cura.MachineSelector { id: machineSelector - visible: workspaceDialog.visible && manager.updatableMachinesModel.count > 1 headerCornerSide: Cura.RoundedRectangle.Direction.All - anchors.top: parent.top - anchors.topMargin: UM.Theme.getSize("default_margin").width * 3 - anchors.right: parent.right - anchors.rightMargin: UM.Theme.getSize("default_margin").width - width: Math.round(parent.width / 2.5) - height: UM.Theme.getSize("button").height + width: parent.width + height: parent.height machineListModel: manager.updatableMachinesModel machineName: manager.machineName diff --git a/plugins/3MFReader/WorkspaceSection.qml b/plugins/3MFReader/WorkspaceSection.qml index 7c8b01be7a..83c96fa94a 100644 --- a/plugins/3MFReader/WorkspaceSection.qml +++ b/plugins/3MFReader/WorkspaceSection.qml @@ -15,7 +15,11 @@ Item property Component content: Item { visible: false } property alias comboboxTitle: comboboxLabel.text - property Component combobox: Item { visible: false } + property Component combobox: Item + { + z: -1 + visible: false + } property string comboboxTooltipText: "" property bool comboboxVisible: false @@ -91,11 +95,11 @@ Item } } - Loader { width: parent.width height: content.height + z: -1 anchors.top: sectionTitleRow.bottom sourceComponent: content }