mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-20 13:17:51 -06:00
Render labels using Text.QtRendering
on OSX
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:
parent
c4f9669887
commit
f0e3c19a34
56 changed files with 129 additions and 337 deletions
|
@ -4,7 +4,7 @@
|
|||
import QtQuick 2.10
|
||||
import QtQuick.Controls 2.3
|
||||
|
||||
import UM 1.3 as UM
|
||||
import UM 1.5 as UM
|
||||
import Cura 1.1 as Cura
|
||||
|
||||
|
||||
|
@ -15,7 +15,7 @@ Item
|
|||
{
|
||||
UM.I18nCatalog { id: catalog; name: "cura" }
|
||||
|
||||
Label
|
||||
UM.Label
|
||||
{
|
||||
id: titleLabel
|
||||
anchors.top: parent.top
|
||||
|
@ -24,7 +24,6 @@ Item
|
|||
text: catalog.i18nc("@label", "Help us to improve Ultimaker Cura")
|
||||
color: UM.Theme.getColor("primary_button")
|
||||
font: UM.Theme.getFont("huge")
|
||||
renderType: Text.NativeRendering
|
||||
}
|
||||
|
||||
// Area where the cloud contents can be put. Pictures, texts and such.
|
||||
|
@ -48,7 +47,7 @@ Item
|
|||
|
||||
spacing: UM.Theme.getSize("wide_margin").height
|
||||
|
||||
Label
|
||||
UM.Label
|
||||
{
|
||||
id: topLabel
|
||||
width: parent.width
|
||||
|
@ -57,8 +56,6 @@ Item
|
|||
text: catalog.i18nc("@text", "Ultimaker Cura collects anonymous data to improve print quality and user experience, including:")
|
||||
wrapMode: Text.WordWrap
|
||||
font: UM.Theme.getFont("medium")
|
||||
color: UM.Theme.getColor("text")
|
||||
renderType: Text.NativeRendering
|
||||
}
|
||||
|
||||
Grid {
|
||||
|
@ -91,7 +88,7 @@ Item
|
|||
}
|
||||
}
|
||||
|
||||
Label
|
||||
UM.Label
|
||||
{
|
||||
id: bottomLabel
|
||||
width: parent.width
|
||||
|
@ -107,10 +104,8 @@ Item
|
|||
textFormat: Text.RichText
|
||||
wrapMode: Text.WordWrap
|
||||
font: UM.Theme.getFont("medium")
|
||||
color: UM.Theme.getColor("text")
|
||||
linkColor: UM.Theme.getColor("text_link")
|
||||
onLinkActivated: CuraApplication.showMoreInformationDialogForAnonymousDataCollection()
|
||||
renderType: Text.NativeRendering
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue