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

Render labels using Text.QtRendering on OSX

Browse source 
Fonts were looking a bit to thick on when using `Text.NativeRendering`, so using `Text.QtRendering` instead. After this the font weight looks identical to figma (as far as I can see).

In this commit I also changed all `Label`'s to `UM.Label`'s and removed default properties where I could.

CURA-9154
This commit is contained in:
c.lamboo 2022-05-10 15:36:50 +02:00
parent c4f9669887
commit f0e3c19a34
56 changed files with 129 additions and 337 deletions
Download patch file Download diff file Expand all files Collapse all files

28
resources/qml/ActionPanel/PrintJobInformation.qml
View file

@ -4,7 +4,7 @@
import QtQuick 2.7
import QtQuick.Controls 2.1
import UM 1.1 as UM
import UM 1.5 as UM
import Cura 1.0 as Cura
Column
@ -26,15 +26,14 @@ Column
leftPadding: UM.Theme.getSize("default_margin").width
rightPadding: UM.Theme.getSize("default_margin").width
Label
UM.Label
{
text: catalog.i18nc("@label", "Time estimation").toUpperCase()
color: UM.Theme.getColor("primary")
font: UM.Theme.getFont("default_bold")
renderType: Text.NativeRendering
}
Label
UM.Label
{
id: byLineType
@ -76,16 +75,13 @@ Column
Repeater
{
model: modelData
Label
UM.Label
{
width: Math.round(byLineType.width * byLineType.columnWidthMultipliers[index])
height: contentHeight
horizontalAlignment: byLineType.columnHorizontalAligns[index]
color: UM.Theme.getColor("text")
font: UM.Theme.getFont("default")
wrapMode: Text.WrapAnywhere
text: modelData
renderType: Text.NativeRendering
}
}
}
@ -94,9 +90,6 @@ Column
width: parent.width - 2 * UM.Theme.getSize("default_margin").width
height: childrenRect.height
color: UM.Theme.getColor("text")
font: UM.Theme.getFont("default")
renderType: Text.NativeRendering
textFormat: Text.RichText
}
}
@ -109,15 +102,14 @@ Column
leftPadding: UM.Theme.getSize("default_margin").width
rightPadding: UM.Theme.getSize("default_margin").width
Label
UM.Label
{
text: catalog.i18nc("@label", "Material estimation").toUpperCase()
color: UM.Theme.getColor("primary")
font: UM.Theme.getFont("default_bold")
renderType: Text.NativeRendering
}
Label
UM.Label
{
id: byMaterialType
@ -180,16 +172,13 @@ Column
Repeater
{
model: modelData
Label
UM.Label
{
width: Math.round(byMaterialType.width * byMaterialType.columnWidthMultipliers[index])
height: contentHeight
horizontalAlignment: byMaterialType.columnHorizontalAligns[index]
color: UM.Theme.getColor("text")
font: UM.Theme.getFont("default")
wrapMode: Text.WrapAnywhere
text: modelData
renderType: Text.NativeRendering
}
}
}
@ -198,9 +187,6 @@ Column
width: parent.width - 2 * UM.Theme.getSize("default_margin").width
height: childrenRect.height
color: UM.Theme.getColor("text")
font: UM.Theme.getFont("default")
renderType: Text.NativeRendering
textFormat: Text.RichText
}
}