GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-10 11:29:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

MaterialInfo: Put height and fonts by QML-elements for 'by material-type'. [CURA-6141]

Browse Source
This commit is contained in:
Remco Burema 2019-01-24 21:56:22 +01:00
parent 654cd8e645
commit 7fdbb11f49
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
resources/qml/ActionPanel/PrintJobInformation.qml
View File

@ -140,16 +140,16 @@ Column
Repeater Repeater
{ {
model: byMaterialType.getMaterialTable() model: byMaterialType.getMaterialTable()
Row Row
{ {
//property var rowLength: modelData.length
Repeater Repeater
{ {
model: modelData model: modelData
Text Text
{ {
width: Math.round(byMaterialType.width * byMaterialType.columnWidthMultipliers[index]) width: Math.round(byMaterialType.width * byMaterialType.columnWidthMultipliers[index])
height: contentHeight
font: UM.Theme.getFont("default")
wrapMode: Text.WrapAnywhere wrapMode: Text.WrapAnywhere
text: modelData text: modelData
} }
@ -159,6 +159,7 @@ Column
} }
width: parent.width - 2 * UM.Theme.getSize("default_margin").width width: parent.width - 2 * UM.Theme.getSize("default_margin").width
height: childrenRect.height
color: UM.Theme.getColor("text") color: UM.Theme.getColor("text")
font: UM.Theme.getFont("default") font: UM.Theme.getFont("default")
renderType: Text.NativeRendering renderType: Text.NativeRendering