3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-25 11:51:41 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Merge branch 'replace_controls_1_for_controls_2' into CURA-8688_qt6_cleanup

Browse source 
# Conflicts:
#	resources/qml/Widgets/Menu.qml
#	resources/qml/Widgets/MenuItem.qml
#	resources/themes/cura-dark/theme.json
#	resources/themes/cura-light/theme.json
This commit is contained in:
j.delarago 2022-02-28 08:51:42 +01:00
commit e2fe50baf1
155 changed files with 406 additions and 667 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -207,6 +207,7 @@ Cura.ExpandablePopup
text: model.material_name
elide: Text.ElideRight
width: parent.width
wrapMode: Text.NoWrap
visible: !materialBrandNameLabel.visible && !truncated
}
@ -217,6 +218,7 @@ Cura.ExpandablePopup
text: model.material_type
elide: Text.ElideRight
width: parent.width
wrapMode: Text.NoWrap
visible: !materialBrandNameLabel.visible && !materialNameLabel.visible
}
// Label that shows the name of the variant
@ -228,6 +230,7 @@ Cura.ExpandablePopup
text: model.variant
elide: Text.ElideRight
wrapMode: Text.NoWrap
font: UM.Theme.getFont("default_bold")
Layout.preferredWidth: parent.width
}