Browse Source

Merge pull request #12161 from Ultimaker/CURA-9106_color_image_weird_scaling

[CURA-9106] Make parent item of ExtruderIcons handle all scaling.
Casper Lamboo 2 years ago
parent
commit
b4ccd690ea

+ 7 - 2
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.AlignCenter
 
                     property var extruderStack: activeMachine ? activeMachine.extruderList[model.index]: null
                     property bool valueWarning: !Cura.ExtruderManager.getExtruderHasQualityForMaterial(extruderStack)

+ 5 - 2
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: