3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-07 23:17:32 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Set renderType to Text.NativeRendering for qtquick controls 2 Labels

Browse source 
Apparently, the qtquickcontrols 2 Label no longer defaults to using renderType: Text.NativeRendering
This causes text to render with QtRendering which looks subtly different on Windows and succinctly broken on some OSX installations.
This commit is contained in:
fieldOfView 2018-02-15 11:12:19 +01:00
parent 44bf6579fd
commit ec1cf4065e
5 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/qml/Settings/SettingComboBox.qml
View file

@ -80,6 +80,7 @@ SettingItem
anchors.right: downArrow.left
text: control.currentText
renderType: Text.NativeRendering
font: UM.Theme.getFont("default")
color: !enabled ? UM.Theme.getColor("setting_control_disabled_text") : UM.Theme.getColor("setting_control_text")
elide: Text.ElideRight
@ -116,6 +117,7 @@ SettingItem
contentItem: Label
{
text: modelData.value
renderType: Text.NativeRendering
color: control.contentItem.color
font: UM.Theme.getFont("default")
elide: Text.ElideRight

2
resources/qml/Settings/SettingExtruder.qml
View file

@ -117,6 +117,7 @@ SettingItem
rightPadding: swatch.width + UM.Theme.getSize("setting_unit_margin").width
text: control.currentText
renderType: Text.NativeRendering
font: UM.Theme.getFont("default")
color: enabled ? UM.Theme.getColor("setting_control_text") : UM.Theme.getColor("setting_control_disabled_text")
@ -171,6 +172,7 @@ SettingItem
contentItem: Label
{
text: model.name
renderType: Text.NativeRendering
color: UM.Theme.getColor("setting_control_text")
font: UM.Theme.getFont("default")
elide: Text.ElideRight

4
resources/qml/Settings/SettingItem.qml
View file

@ -112,11 +112,9 @@ Item {
anchors.right: settingControls.left;
anchors.verticalCenter: parent.verticalCenter
height: UM.Theme.getSize("section").height;
verticalAlignment: Text.AlignVCenter;
text: definition.label
elide: Text.ElideMiddle;
renderType: Text.NativeRendering
color: UM.Theme.getColor("setting_control_text");
opacity: (definition.visible) ? 1 : 0.5

2
resources/qml/Settings/SettingOptionalExtruder.qml
View file

@ -136,6 +136,7 @@ SettingItem
rightPadding: swatch.width + UM.Theme.getSize("setting_unit_margin").width
text: control.currentText
renderType: Text.NativeRendering
font: UM.Theme.getFont("default")
color: enabled ? UM.Theme.getColor("setting_control_text") : UM.Theme.getColor("setting_control_disabled_text")
@ -190,6 +191,7 @@ SettingItem
contentItem: Label
{
text: model.name
renderType: Text.NativeRendering
color: UM.Theme.getColor("setting_control_text")
font: UM.Theme.getFont("default")
elide: Text.ElideRight