Merge pull request #10330 from Ultimaker/CURA-8496_Fix_long_material_names_overlappint_with_icon

CURA-8496: Fix showing only the material type after resizing Cura's window
This commit is contained in:
Jelle Spijker 2021-08-25 11:57:54 +02:00 committed by GitHub
commit 50c11e5fdf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -60,7 +60,7 @@ Cura.ExpandablePopup
anchors.verticalCenter: parent.verticalCenter
}
ColumnLayout
Column
{
opacity: model.enabled ? 1 : UM.Theme.getColor("extruder_disabled").a
spacing: 0
@ -83,7 +83,7 @@ Cura.ExpandablePopup
font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text")
renderType: Text.NativeRendering
Layout.preferredWidth: parent.width
width: parent.width
visible: !truncated
}
@ -96,7 +96,7 @@ Cura.ExpandablePopup
font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text")
renderType: Text.NativeRendering
Layout.preferredWidth: parent.width
width: 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
Layout.preferredWidth: parent.width
width: parent.width
visible: !materialBrandColorTypeLabel.visible && !materialColorTypeLabel.visible
}
// Label that shows the name of the variant