From 203251fc195d31f39b52d9a20fb9a09f70e4d5a8 Mon Sep 17 00:00:00 2001
From: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Date: Sat, 3 Nov 2012 16:13:12 +0100
Subject: [PATCH] Use native rendering where applicable
Change-Id: I5dc03f1025ecb37c5e3b6605399b4dd063078fa6
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
---
imports/QtDesktop/CheckBox.qml | 2 ++
imports/QtDesktop/RadioButton.qml | 2 ++
imports/QtDesktop/TableView.qml | 1 +
imports/QtDesktop/TextArea.qml | 1 +
imports/QtDesktop/TextField.qml | 1 +
imports/QtDesktop/ToolButton.qml | 2 +-
6 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/imports/QtDesktop/CheckBox.qml b/imports/QtDesktop/CheckBox.qml
index 7a254dd9f..dfc2dbf88 100644
--- a/imports/QtDesktop/CheckBox.qml
+++ b/imports/QtDesktop/CheckBox.qml
@@ -79,8 +79,10 @@ FocusScope {
anchors.left: parent.left
anchors.leftMargin: parent.indicatorWidth
anchors.verticalCenter: parent.verticalCenter
+ anchors.verticalCenterOffset: 1
anchors.right: parent.right
elide: Text.ElideRight
+ renderType: Text.NativeRendering
}
}
diff --git a/imports/QtDesktop/RadioButton.qml b/imports/QtDesktop/RadioButton.qml
index c6ff4a0fd..d5ec4e36a 100644
--- a/imports/QtDesktop/RadioButton.qml
+++ b/imports/QtDesktop/RadioButton.qml
@@ -65,8 +65,10 @@ CheckBox {
anchors.left: parent.left
anchors.leftMargin: parent.indicatorWidth
anchors.verticalCenter: parent.verticalCenter
+ anchors.verticalCenterOffset: 1
anchors.right: parent.right
elide: Text.ElideRight
+ renderType: Text.NativeRendering
}
}
}
diff --git a/imports/QtDesktop/TableView.qml b/imports/QtDesktop/TableView.qml
index 56a8eb3de..1655d2eb4 100644
--- a/imports/QtDesktop/TableView.qml
+++ b/imports/QtDesktop/TableView.qml
@@ -168,6 +168,7 @@ FocusScope{
elide: itemElideMode
text: itemValue ? itemValue : ""
color: itemForeground
+ renderType: Text.NativeRendering
}
Text {
id: sizehint
diff --git a/imports/QtDesktop/TextArea.qml b/imports/QtDesktop/TextArea.qml
index d216e269f..34b90d7c2 100644
--- a/imports/QtDesktop/TextArea.qml
+++ b/imports/QtDesktop/TextArea.qml
@@ -75,6 +75,7 @@ ScrollArea {
cursorShape: Qt.IBeamCursor
acceptedButtons: Qt.NoButton
}
+ renderType: Text.NativeRendering
id: edit
selectionColor: syspal.highlight
diff --git a/imports/QtDesktop/TextField.qml b/imports/QtDesktop/TextField.qml
index 5def9f5d4..0b7845a71 100644
--- a/imports/QtDesktop/TextField.qml
+++ b/imports/QtDesktop/TextField.qml
@@ -182,6 +182,7 @@ FocusScope {
color: syspal.text
echoMode: passwordMode ? TextInput.Password : TextInput.Normal
clip: true
+ renderType: Text.NativeRendering
}
Text {
diff --git a/imports/QtDesktop/ToolButton.qml b/imports/QtDesktop/ToolButton.qml
index 55dd7bbc8..2b36b8ba9 100644
--- a/imports/QtDesktop/ToolButton.qml
+++ b/imports/QtDesktop/ToolButton.qml
@@ -61,7 +61,7 @@ Private.BasicButton {
info: __position
hint: button.styleHint
contentWidth: Math.max(textitem.paintedWidth, 32)
- contentHeight: 32
+ contentHeight: 30
Text {
id: textitem
text: button.text
--
GitLab