3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-06 21:44:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Make parent item of ExtruderIcons handle all scaling.

Browse source 
CURA-9106
This commit is contained in:
Remco Burema 2022-05-10 17:48:05 +02:00
parent c4f9669887
commit 5479479596
2 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -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
}

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

@ -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: