diff options
| author | Remco Burema <r.burema@ultimaker.com> | 2022-05-10 18:48:05 +0300 |
|---|---|---|
| committer | Remco Burema <r.burema@ultimaker.com> | 2022-05-10 18:48:05 +0300 |
| commit | 5479479596f833087cd20f18fd13dadb39d00678 (patch) | |
| tree | d5d0625f62f4c976fab07a36dc080e4cbb688d82 | |
| parent | c4f9669887569f01d302382be15a1246e201617d (diff) | |
Make parent item of ExtruderIcons handle all scaling.
CURA-9106
| -rw-r--r-- | resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml | 10 | ||||
| -rw-r--r-- | resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml | 7 |
2 files changed, 13 insertions, 4 deletions
diff --git a/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml b/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml index 8d4fc9c2b5..29b5c8c4ae 100644 --- a/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml +++ b/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml @@ -36,6 +36,8 @@ Cura.ExpandablePopup headerItem: Item { + id: headerBase + // Horizontal list that shows the extruders and their materials RowLayout { @@ -51,9 +53,12 @@ Cura.ExpandablePopup { id: extruderItem - Layout.preferredWidth: Math.round(parent.width / extrudersModel.count) - Layout.maximumWidth: Math.round(parent.width / extrudersModel.count) + Layout.preferredWidth: Math.floor(headerBase.width / extrudersModel.count) + Layout.maximumWidth: Math.floor(headerBase.width / extrudersModel.count) + Layout.preferredHeight: headerBase.height + Layout.maximumHeight: headerBase.height Layout.fillHeight: true + Layout.alignment: Qt.AlignmentFlag.AlignHCenter | Qt.AlignmentFlag.AlignVCenter property var extruderStack: activeMachine ? activeMachine.extruderList[model.index]: null property bool valueWarning: !Cura.ExtruderManager.getExtruderHasQualityForMaterial(extruderStack) @@ -65,6 +70,7 @@ Cura.ExpandablePopup id: extruderIcon materialColor: model.color extruderEnabled: model.enabled + anchors.horizontalCenter: parent.horizontalCenter anchors.verticalCenter: parent.verticalCenter } diff --git a/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml b/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml index 7223706e63..c24c031e83 100644 --- a/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml +++ b/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml @@ -97,13 +97,16 @@ Item checked: model.index == 0 contentItem: Item { + anchors.horizontalCenter: parent.horizontalCenter + anchors.verticalCenter: parent.verticalCenter + width: Math.floor(tabBar.height / extrudersModel.count) + height: tabBar.height Cura.ExtruderIcon { anchors.horizontalCenter: parent.horizontalCenter + anchors.verticalCenter: parent.verticalCenter materialColor: model.color extruderEnabled: model.enabled - width: parent.height - height: parent.height } } onClicked: |