From ddff2017c81df838aac0ad19b6a3accd36254a7d Mon Sep 17 00:00:00 2001 From: Gunnar Sletta Date: Thu, 22 Mar 2012 13:50:32 +0100 Subject: [PATCH] Change smooth to be true by default Change-Id: Ia74a5c76058a2822e61dfa2f7316ea0612ebc15c Reviewed-by: Lars Knoll --- src/quick/items/qquickitem.cpp | 14 ++++++++------ tests/auto/quick/qquickcanvasitem/data/tst_arc.qml | 1 + .../auto/quick/qquickcanvasitem/data/tst_arcto.qml | 1 + .../auto/quick/qquickcanvasitem/data/tst_path.qml | 1 + .../qquickcanvasitem/data/tst_strokeStyle.qml | 1 + tests/auto/quick/qquicktext/tst_qquicktext.cpp | 12 ++++++------ 6 files changed, 18 insertions(+), 12 deletions(-) diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp index 9f82c7e37c..a5b70bb1f2 100644 --- a/src/quick/items/qquickitem.cpp +++ b/src/quick/items/qquickitem.cpp @@ -2387,7 +2387,7 @@ bool QQuickItem::isComponentComplete() const QQuickItemPrivate::QQuickItemPrivate() : _anchors(0), _stateGroup(0), flags(0), widthValid(false), heightValid(false), baselineOffsetValid(false), componentComplete(true), - keepMouse(false), keepTouch(false), hoverEnabled(false), smooth(false), focus(false), activeFocus(false), notifiedFocus(false), + keepMouse(false), keepTouch(false), hoverEnabled(false), smooth(true), focus(false), activeFocus(false), notifiedFocus(false), notifiedActiveFocus(false), filtersChildMouseEvents(false), explicitVisible(true), effectiveVisible(true), explicitEnable(true), effectiveEnable(true), polishScheduled(false), inheritedLayoutMirror(false), effectiveLayoutMirror(false), isMirrorImplicit(true), @@ -4314,13 +4314,15 @@ void QQuickItemPrivate::itemChange(QQuickItem::ItemChange change, const QQuickIt /*! \property QQuickItem::smooth - \brief whether the item is smoothly transformed. + \brief whether the item is smoothed or not. - This property is provided purely for the purpose of optimization. Turning - smooth transforms off is faster, but looks worse; turning smooth - transformations on is slower, but looks better. + Primarily used in image based elements to decide if the item should use smooth + sampling or not. Smooth sampling is performed using linear interpolation, while + non-smooth is performed using nearest neighbor. - By default smooth transformations are off. + In Qt Quick 2.0, this property has minimal impact on performance. + + By default is true. */ /*! diff --git a/tests/auto/quick/qquickcanvasitem/data/tst_arc.qml b/tests/auto/quick/qquickcanvasitem/data/tst_arc.qml index ffe6583d2e..c33901d294 100644 --- a/tests/auto/quick/qquickcanvasitem/data/tst_arc.qml +++ b/tests/auto/quick/qquickcanvasitem/data/tst_arc.qml @@ -4,6 +4,7 @@ import "testhelper.js" as Helper Canvas { id:canvas; width:100;height:50; renderTarget: Canvas.Image; renderStrategy:Canvas.Threaded + smooth: false TestCase { name: "arc"; when: windowShown function test_angle_1() { diff --git a/tests/auto/quick/qquickcanvasitem/data/tst_arcto.qml b/tests/auto/quick/qquickcanvasitem/data/tst_arcto.qml index 8609ad0332..84bfc1a8db 100644 --- a/tests/auto/quick/qquickcanvasitem/data/tst_arcto.qml +++ b/tests/auto/quick/qquickcanvasitem/data/tst_arcto.qml @@ -4,6 +4,7 @@ import "testhelper.js" as Helper Canvas { id:canvas; width:100;height:50; renderTarget: Canvas.Image; renderStrategy:Canvas.Threaded + smooth: false TestCase { name: "arcTo"; when: windowShown function test_coincide() { diff --git a/tests/auto/quick/qquickcanvasitem/data/tst_path.qml b/tests/auto/quick/qquickcanvasitem/data/tst_path.qml index 6aaecbdfa5..f72e5b9eaa 100644 --- a/tests/auto/quick/qquickcanvasitem/data/tst_path.qml +++ b/tests/auto/quick/qquickcanvasitem/data/tst_path.qml @@ -4,6 +4,7 @@ import "testhelper.js" as Helper Canvas { id:canvas; width:100;height:50; renderTarget: Canvas.Image; renderStrategy:Canvas.Threaded + smooth: false TestCase { name: "path"; when: windowShown diff --git a/tests/auto/quick/qquickcanvasitem/data/tst_strokeStyle.qml b/tests/auto/quick/qquickcanvasitem/data/tst_strokeStyle.qml index 2521643837..c81ef73b90 100644 --- a/tests/auto/quick/qquickcanvasitem/data/tst_strokeStyle.qml +++ b/tests/auto/quick/qquickcanvasitem/data/tst_strokeStyle.qml @@ -4,6 +4,7 @@ import "testhelper.js" as Helper Canvas { id:canvas; width:100;height:50; renderTarget:Canvas.Image; renderStrategy:Canvas.Threaded + smooth: false TestCase { name: "strokeStyle"; when: windowShown function test_default() { diff --git a/tests/auto/quick/qquicktext/tst_qquicktext.cpp b/tests/auto/quick/qquicktext/tst_qquicktext.cpp index 45d09bc866..81020ad399 100644 --- a/tests/auto/quick/qquicktext/tst_qquicktext.cpp +++ b/tests/auto/quick/qquicktext/tst_qquicktext.cpp @@ -1071,11 +1071,11 @@ void tst_qquicktext::smooth() for (int i = 0; i < standard.size(); i++) { { - QString componentStr = "import QtQuick 2.0\nText { smooth: true; text: \"" + standard.at(i) + "\" }"; + QString componentStr = "import QtQuick 2.0\nText { smooth: false; text: \"" + standard.at(i) + "\" }"; QQmlComponent textComponent(&engine); textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); QQuickText *textObject = qobject_cast(textComponent.create()); - QCOMPARE(textObject->smooth(), true); + QCOMPARE(textObject->smooth(), false); delete textObject; } @@ -1084,7 +1084,7 @@ void tst_qquicktext::smooth() QQmlComponent textComponent(&engine); textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); QQuickText *textObject = qobject_cast(textComponent.create()); - QCOMPARE(textObject->smooth(), false); + QCOMPARE(textObject->smooth(), true); delete textObject; } @@ -1092,11 +1092,11 @@ void tst_qquicktext::smooth() for (int i = 0; i < richText.size(); i++) { { - QString componentStr = "import QtQuick 2.0\nText { smooth: true; text: \"" + richText.at(i) + "\" }"; + QString componentStr = "import QtQuick 2.0\nText { smooth: false; text: \"" + richText.at(i) + "\" }"; QQmlComponent textComponent(&engine); textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); QQuickText *textObject = qobject_cast(textComponent.create()); - QCOMPARE(textObject->smooth(), true); + QCOMPARE(textObject->smooth(), false); delete textObject; } @@ -1105,7 +1105,7 @@ void tst_qquicktext::smooth() QQmlComponent textComponent(&engine); textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); QQuickText *textObject = qobject_cast(textComponent.create()); - QCOMPARE(textObject->smooth(), false); + QCOMPARE(textObject->smooth(), true); delete textObject; }