From 95e0021cce61ca8287e1c7565447bd9d1855caac Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Wed, 9 Nov 2022 15:55:48 +0100 Subject: [PATCH] Align dropdown in open project dialog CURA-9424 --- plugins/3MFReader/WorkspaceDialog.qml | 5 +++-- resources/qml/PrinterSelector/MachineSelector.qml | 7 +++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/plugins/3MFReader/WorkspaceDialog.qml b/plugins/3MFReader/WorkspaceDialog.qml index ae4c44d0a6..f452ab0252 100644 --- a/plugins/3MFReader/WorkspaceDialog.qml +++ b/plugins/3MFReader/WorkspaceDialog.qml @@ -111,9 +111,8 @@ UM.Dialog { id: machineSelector headerCornerSide: Cura.RoundedRectangle.Direction.All - width: UM.Theme.getSize("machine_selector_widget").width + width: parent.width height: parent.height - anchors.centerIn: parent machineListModel: manager.updatableMachinesModel machineName: manager.machineName @@ -122,6 +121,8 @@ UM.Dialog isCloudRegistered: false isGroup: false + minDropDownWidth: machineSelector.width + buttons: [ Cura.SecondaryButton { diff --git a/resources/qml/PrinterSelector/MachineSelector.qml b/resources/qml/PrinterSelector/MachineSelector.qml index 8bf5e3cf1d..b8bacc8f36 100644 --- a/resources/qml/PrinterSelector/MachineSelector.qml +++ b/resources/qml/PrinterSelector/MachineSelector.qml @@ -198,11 +198,14 @@ Cura.ExpandablePopup } } + property int minDropDownWidth: UM.Theme.getSize("machine_selector_widget_content").width + property int maxDropDownHeight: UM.Theme.getSize("machine_selector_widget_content").height + contentItem: Item { id: popup - implicitWidth: Math.max(machineSelector.width, UM.Theme.getSize("machine_selector_widget_content").width) - implicitHeight: Math.min(machineSelectorList.contentHeight + separator.height + buttonRow.height, UM.Theme.getSize("machine_selector_widget_content").height) //Maximum height is the theme entry. + implicitWidth: Math.max(machineSelector.width, minDropDownWidth) + implicitHeight: Math.min(machineSelectorList.contentHeight + separator.height + buttonRow.height, maxDropDownHeight) //Maximum height is the theme entry. MachineSelectorList { id: machineSelectorList