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

Merge branch '4.11' of github.com:Ultimaker/Cura

Browse source
This commit is contained in:
Jaime van Kessel 2021-08-23 11:01:01 +02:00
commit 78b6bf2ed4
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -48,6 +48,7 @@ Cura.ExpandablePopup
delegate: Item
{
Layout.preferredWidth: Math.round(parent.width / extrudersModel.count)
Layout.maximumWidth: Math.round(parent.width / extrudersModel.count)
Layout.fillHeight: true
// Extruder icon. Shows extruder index and has the same color as the active material.
@ -63,6 +64,7 @@ Cura.ExpandablePopup
{
opacity: model.enabled ? 1 : UM.Theme.getColor("extruder_disabled").a
spacing: 0
visible: width > 0
anchors
{
left: extruderIcon.right
@ -81,8 +83,7 @@ Cura.ExpandablePopup
font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text")
renderType: Text.NativeRendering
width: parent.width
Layout.preferredWidth: parent.width
visible: !truncated
}
@ -95,8 +96,7 @@ Cura.ExpandablePopup
font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text")
renderType: Text.NativeRendering
width: parent.width
Layout.preferredWidth: parent.width
visible: !materialBrandColorTypeLabel.visible && !truncated
}
@ -109,7 +109,7 @@ Cura.ExpandablePopup
font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text")
renderType: Text.NativeRendering
width: parent.width
Layout.preferredWidth: parent.width
visible: !materialBrandColorTypeLabel.visible && !materialColorTypeLabel.visible
}
// Label that shows the name of the variant
@ -124,7 +124,7 @@ Cura.ExpandablePopup
font: UM.Theme.getFont("default_bold")
color: UM.Theme.getColor("text")
renderType: Text.NativeRendering
width: parent.width
Layout.preferredWidth: parent.width
}
}
}