3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-26 16:13:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

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

Browse source 
[CURA-9106] Make parent item of ExtruderIcons handle all scaling.
This commit is contained in:
Casper Lamboo 2022-05-11 17:30:55 +02:00 • committed by GitHub
commit b4ccd690ea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml
View file

@ -36,6 +36,8 @@ Cura.ExpandablePopup
headerItem: Item headerItem: Item
{ {
id: headerBase
// Horizontal list that shows the extruders and their materials // Horizontal list that shows the extruders and their materials
RowLayout RowLayout
{ {
@ -51,9 +53,12 @@ Cura.ExpandablePopup
{ {
id: extruderItem id: extruderItem
Layout.preferredWidth: Math.round(parent.width / extrudersModel.count) Layout.preferredWidth: Math.floor(headerBase.width / extrudersModel.count)
Layout.maximumWidth: Math.round(parent.width / extrudersModel.count) Layout.maximumWidth: Math.floor(headerBase.width / extrudersModel.count)
Layout.preferredHeight: headerBase.height
Layout.maximumHeight: headerBase.height
Layout.fillHeight: true Layout.fillHeight: true
Layout.alignment: Qt.AlignCenter
property var extruderStack: activeMachine ? activeMachine.extruderList[model.index]: null property var extruderStack: activeMachine ? activeMachine.extruderList[model.index]: null
property bool valueWarning: !Cura.ExtruderManager.getExtruderHasQualityForMaterial(extruderStack) property bool valueWarning: !Cura.ExtruderManager.getExtruderHasQualityForMaterial(extruderStack)

7
resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml
View file

@ -97,13 +97,16 @@ Item
checked: model.index == 0 checked: model.index == 0
contentItem: Item contentItem: Item
{ {
anchors.horizontalCenter: parent.horizontalCenter
anchors.verticalCenter: parent.verticalCenter
width: Math.floor(tabBar.height / extrudersModel.count)
height: tabBar.height
Cura.ExtruderIcon Cura.ExtruderIcon
{ {
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
anchors.verticalCenter: parent.verticalCenter
materialColor: model.color materialColor: model.color
extruderEnabled: model.enabled extruderEnabled: model.enabled
width: parent.height
height: parent.height
} }
} }
onClicked: onClicked: