aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/universal
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@theqtcompany.com>2016-02-26 12:16:32 +0100
committerJ-P Nurmi <jpnurmi@theqtcompany.com>2016-02-26 11:51:34 +0000
commit3f5a66eb891e292281656fb43181ceb9d774e7aa (patch)
treea4ff44fe6be8674ffaa9b91526e03c9612d8e157 /src/imports/controls/universal
parentdb5780507733ef803e963dcef0b5260c4b94acfa (diff)
Universal: switch to distance field text rendering
Native text rendering is typically better on low density displays on Windows, but everywhere else, the distance field rendering gives better results. Our main target is not the classic GDI-based Windows desktop, but modern mobile typically with high density displays. Change-Id: Ibdaea09815a3915a720a04b2345e0c10c9753d2d Task-number: QTBUG-41432 Task-number: QTBUG-50971 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'src/imports/controls/universal')
-rw-r--r--src/imports/controls/universal/Button.qml1
-rw-r--r--src/imports/controls/universal/CheckBox.qml1
-rw-r--r--src/imports/controls/universal/ComboBox.qml1
-rw-r--r--src/imports/controls/universal/GroupBox.qml1
-rw-r--r--src/imports/controls/universal/ItemDelegate.qml1
-rw-r--r--src/imports/controls/universal/Label.qml1
-rw-r--r--src/imports/controls/universal/RadioButton.qml1
-rw-r--r--src/imports/controls/universal/SpinBox.qml1
-rw-r--r--src/imports/controls/universal/Switch.qml1
-rw-r--r--src/imports/controls/universal/TabButton.qml1
-rw-r--r--src/imports/controls/universal/TextArea.qml2
-rw-r--r--src/imports/controls/universal/TextField.qml2
-rw-r--r--src/imports/controls/universal/ToolButton.qml1
-rw-r--r--src/imports/controls/universal/Tumbler.qml1
14 files changed, 0 insertions, 16 deletions
diff --git a/src/imports/controls/universal/Button.qml b/src/imports/controls/universal/Button.qml
index c43d8d67..1dc94c89 100644
--- a/src/imports/controls/universal/Button.qml
+++ b/src/imports/controls/universal/Button.qml
@@ -66,7 +66,6 @@ T.Button {
elide: Text.ElideRight
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
- renderType: Text.NativeRendering
color: !control.enabled ? control.Universal.baseLowColor : control.Universal.baseHighColor
}
diff --git a/src/imports/controls/universal/CheckBox.qml b/src/imports/controls/universal/CheckBox.qml
index 07321a9c..37c20d00 100644
--- a/src/imports/controls/universal/CheckBox.qml
+++ b/src/imports/controls/universal/CheckBox.qml
@@ -105,7 +105,6 @@ T.CheckBox {
visible: control.text
horizontalAlignment: Text.AlignLeft
verticalAlignment: Text.AlignVCenter
- renderType: Text.NativeRendering
color: !control.enabled ? control.Universal.baseLowColor : control.Universal.baseHighColor
}
diff --git a/src/imports/controls/universal/ComboBox.qml b/src/imports/controls/universal/ComboBox.qml
index 5c0f1004..03278e10 100644
--- a/src/imports/controls/universal/ComboBox.qml
+++ b/src/imports/controls/universal/ComboBox.qml
@@ -70,7 +70,6 @@ T.ComboBox {
color: !control.enabled ? control.Universal.baseLowColor : control.Universal.baseHighColor
horizontalAlignment: Text.AlignLeft
verticalAlignment: Text.AlignVCenter
- renderType: Text.NativeRendering
elide: Text.ElideRight
rightPadding: 12 + control.spacing
}
diff --git a/src/imports/controls/universal/GroupBox.qml b/src/imports/controls/universal/GroupBox.qml
index 9b21a17f..b4e28eb1 100644
--- a/src/imports/controls/universal/GroupBox.qml
+++ b/src/imports/controls/universal/GroupBox.qml
@@ -68,7 +68,6 @@ T.GroupBox {
elide: Text.ElideRight
horizontalAlignment: Text.AlignLeft
verticalAlignment: Text.AlignVCenter
- renderType: Text.NativeRendering
}
//! [label]
diff --git a/src/imports/controls/universal/ItemDelegate.qml b/src/imports/controls/universal/ItemDelegate.qml
index d2c9a4f3..2aaf270b 100644
--- a/src/imports/controls/universal/ItemDelegate.qml
+++ b/src/imports/controls/universal/ItemDelegate.qml
@@ -80,7 +80,6 @@ T.ItemDelegate {
visible: control.text
horizontalAlignment: Text.AlignLeft
verticalAlignment: Text.AlignVCenter
- renderType: Text.NativeRendering
color: !control.enabled ? control.Universal.baseLowColor : control.Universal.baseHighColor
}
diff --git a/src/imports/controls/universal/Label.qml b/src/imports/controls/universal/Label.qml
index 0484959e..7630364c 100644
--- a/src/imports/controls/universal/Label.qml
+++ b/src/imports/controls/universal/Label.qml
@@ -43,5 +43,4 @@ T.Label {
color: !control.enabled ? Universal.baseLowColor : Universal.baseHighColor
linkColor: Universal.accent
- renderType: Text.NativeRendering
}
diff --git a/src/imports/controls/universal/RadioButton.qml b/src/imports/controls/universal/RadioButton.qml
index 04cd3dcc..95e55db9 100644
--- a/src/imports/controls/universal/RadioButton.qml
+++ b/src/imports/controls/universal/RadioButton.qml
@@ -111,7 +111,6 @@ T.RadioButton {
visible: control.text
horizontalAlignment: Text.AlignLeft
verticalAlignment: Text.AlignVCenter
- renderType: Text.NativeRendering
color: !control.enabled ? control.Universal.baseLowColor : control.Universal.baseHighColor
}
diff --git a/src/imports/controls/universal/SpinBox.qml b/src/imports/controls/universal/SpinBox.qml
index 77eb241e..c903baf4 100644
--- a/src/imports/controls/universal/SpinBox.qml
+++ b/src/imports/controls/universal/SpinBox.qml
@@ -78,7 +78,6 @@ T.SpinBox {
selectedTextColor: control.Universal.chromeWhiteColor
horizontalAlignment: Qt.AlignHCenter
verticalAlignment: TextInput.AlignVCenter
- renderType: Text.NativeRendering
validator: control.validator
inputMethodHints: Qt.ImhFormattedNumbersOnly
diff --git a/src/imports/controls/universal/Switch.qml b/src/imports/controls/universal/Switch.qml
index ca33e121..768291fc 100644
--- a/src/imports/controls/universal/Switch.qml
+++ b/src/imports/controls/universal/Switch.qml
@@ -103,7 +103,6 @@ T.Switch {
visible: control.text
horizontalAlignment: Text.AlignLeft
verticalAlignment: Text.AlignVCenter
- renderType: Text.NativeRendering
color: !control.enabled ? control.Universal.baseLowColor : control.Universal.baseHighColor
}
diff --git a/src/imports/controls/universal/TabButton.qml b/src/imports/controls/universal/TabButton.qml
index 3b9fc60c..c736a87b 100644
--- a/src/imports/controls/universal/TabButton.qml
+++ b/src/imports/controls/universal/TabButton.qml
@@ -62,7 +62,6 @@ T.TabButton {
color: control.checked || control.pressed ? control.Universal.baseHighColor : control.Universal.baseLowColor
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
- renderType: Text.NativeRendering
}
//! [label]
}
diff --git a/src/imports/controls/universal/TextArea.qml b/src/imports/controls/universal/TextArea.qml
index 72b69cb9..255f5774 100644
--- a/src/imports/controls/universal/TextArea.qml
+++ b/src/imports/controls/universal/TextArea.qml
@@ -60,7 +60,6 @@ T.TextArea {
activeFocus ? Universal.chromeBlackHighColor : Universal.baseHighColor
selectionColor: Universal.accent
selectedTextColor: Universal.chromeWhiteColor
- renderType: Text.NativeRendering
Text {
id: placeholder
@@ -76,7 +75,6 @@ T.TextArea {
visible: !control.length && (!control.activeFocus || control.horizontalAlignment !== Qt.AlignHCenter)
horizontalAlignment: control.horizontalAlignment
verticalAlignment: control.verticalAlignment
- renderType: Text.NativeRendering
elide: Text.ElideRight
}
diff --git a/src/imports/controls/universal/TextField.qml b/src/imports/controls/universal/TextField.qml
index 1f066220..fe9e071d 100644
--- a/src/imports/controls/universal/TextField.qml
+++ b/src/imports/controls/universal/TextField.qml
@@ -61,7 +61,6 @@ T.TextField {
selectionColor: Universal.accent
selectedTextColor: Universal.chromeWhiteColor
verticalAlignment: TextInput.AlignVCenter
- renderType: Text.NativeRendering
Text {
id: placeholder
@@ -77,7 +76,6 @@ T.TextField {
visible: !control.displayText && (!control.activeFocus || control.horizontalAlignment !== Qt.AlignHCenter)
horizontalAlignment: control.horizontalAlignment
verticalAlignment: control.verticalAlignment
- renderType: Text.NativeRendering
elide: Text.ElideRight
}
diff --git a/src/imports/controls/universal/ToolButton.qml b/src/imports/controls/universal/ToolButton.qml
index f3fe80d4..a8fa8bd5 100644
--- a/src/imports/controls/universal/ToolButton.qml
+++ b/src/imports/controls/universal/ToolButton.qml
@@ -64,7 +64,6 @@ T.ToolButton {
elide: Text.ElideRight
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
- renderType: Text.NativeRendering
}
//! [label]
diff --git a/src/imports/controls/universal/Tumbler.qml b/src/imports/controls/universal/Tumbler.qml
index d327733c..e1efca06 100644
--- a/src/imports/controls/universal/Tumbler.qml
+++ b/src/imports/controls/universal/Tumbler.qml
@@ -53,7 +53,6 @@ T.Tumbler {
opacity: 0.4 + Math.max(0, 1 - Math.abs(Tumbler.displacement)) * 0.6
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
- renderType: Text.NativeRendering
}
//! [delegate]