From 3f5a66eb891e292281656fb43181ceb9d774e7aa Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Fri, 26 Feb 2016 12:16:32 +0100 Subject: 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 --- src/imports/controls/universal/Button.qml | 1 - src/imports/controls/universal/CheckBox.qml | 1 - src/imports/controls/universal/ComboBox.qml | 1 - src/imports/controls/universal/GroupBox.qml | 1 - src/imports/controls/universal/ItemDelegate.qml | 1 - src/imports/controls/universal/Label.qml | 1 - src/imports/controls/universal/RadioButton.qml | 1 - src/imports/controls/universal/SpinBox.qml | 1 - src/imports/controls/universal/Switch.qml | 1 - src/imports/controls/universal/TabButton.qml | 1 - src/imports/controls/universal/TextArea.qml | 2 -- src/imports/controls/universal/TextField.qml | 2 -- src/imports/controls/universal/ToolButton.qml | 1 - src/imports/controls/universal/Tumbler.qml | 1 - 14 files changed, 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] -- cgit v1.2.3 From 9e62dda2e3d6e5a90d3a56aeedda10caebc96cd3 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Fri, 26 Feb 2016 12:29:10 +0100 Subject: Register QQuickItem revision 2 This makes the following revisioned properties and invokable methods in QQuickItem available to QQuickControl and its subclasses: - activeFocusOnTab - rev1 - nextItemInFocusChain() - rev1 - grabToImage() - rev2 Change-Id: Id7ce43630c1f8d76dd58cc0944ec8a0b1e77c3ef Reviewed-by: Mitch Curtis --- src/imports/templates/qtlabstemplatesplugin.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/imports/templates/qtlabstemplatesplugin.cpp b/src/imports/templates/qtlabstemplatesplugin.cpp index 635a2006..fd5060d4 100644 --- a/src/imports/templates/qtlabstemplatesplugin.cpp +++ b/src/imports/templates/qtlabstemplatesplugin.cpp @@ -132,6 +132,7 @@ void QtLabsTemplatesPlugin::registerTypes(const char *uri) qmlRegisterType(); qmlRegisterType(uri, 1, 0, "Tumbler"); + qmlRegisterRevision(uri, 1, 0); qmlRegisterRevision(uri, 1, 0); qmlRegisterRevision(uri, 1, 0); qmlRegisterRevision(uri, 1, 0); -- cgit v1.2.3 From 179d5ec7953f493a119be69be254b699061fd793 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Mon, 29 Feb 2016 16:27:05 +0100 Subject: Material: enable Popup drop shadow The drop shadow was added in 7427e28, but it was never actually visible. It went unnoticed against the overlay background, because the popups in Gallery are modal... :p Change-Id: I043939098e8b45039a696f719fc414258d56c087 Reviewed-by: Mitch Curtis --- src/imports/controls/material/Popup.qml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/imports/controls/material/Popup.qml b/src/imports/controls/material/Popup.qml index 649c5837..8fa9f7f7 100644 --- a/src/imports/controls/material/Popup.qml +++ b/src/imports/controls/material/Popup.qml @@ -68,6 +68,7 @@ T.Popup { radius: 3 color: control.Material.dialogColor + layer.enabled: true layer.effect: DropShadow { verticalOffset: 1 color: control.Material.dropShadowColor -- cgit v1.2.3 From bce843844b8edabc4365d0ef7175b54551217631 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Tue, 1 Mar 2016 16:25:00 +0100 Subject: Fix QQuickPopup::setParentItem() Don't call naturalControlFont() or calcLocale() with a null pointer, because it will crash. Change-Id: Ib4b6dba85e6c55832c30b5178b74ebf39429a5f8 Reviewed-by: Liang Qi --- src/templates/qquickpopup.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/templates/qquickpopup.cpp b/src/templates/qquickpopup.cpp index f9cf2f51..36d98813 100644 --- a/src/templates/qquickpopup.cpp +++ b/src/templates/qquickpopup.cpp @@ -1176,7 +1176,7 @@ void QQuickPopup::setParentItem(QQuickItem *parent) d->parentItem = parent; if (d->positioner.parentItem()) d->positioner.setParentItem(parent); - if (d->popupItem) { + if (parent) { QQuickControlPrivate::updateFontRecur(d->popupItem, QQuickControlPrivate::naturalControlFont(parent)); QQuickControlPrivate::updateLocaleRecur(d->popupItem, QQuickControlPrivate::calcLocale(parent)); } -- cgit v1.2.3