diff options
| author | Gunnar Sletta <gunnar@sletta.org> | 2015-10-19 10:42:32 +0200 |
|---|---|---|
| committer | Gunnar Sletta <gunnar@sletta.org> | 2015-10-19 09:46:28 +0000 |
| commit | 936c16ebe6ea148c09e31cd38f5b25450f9407f5 (patch) | |
| tree | 9d993bb995766c0733b9a50287a0a126f97d269c | |
| parent | b09a5387595cb22a0fd67d7409ea52cf60f55bb6 (diff) | |
| download | qtgraphicaleffects-936c16ebe6ea148c09e31cd38f5b25450f9407f5.tar.gz | |
Make DropShadow properties into 'real' again.
Change-Id: Icf416b5db2cf9dbb0be29fc0e3b9a855c58035e3
Task-number: QTBUG-48625
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
| -rw-r--r-- | src/effects/private/DropShadowBase.qml | 10 | ||||
| -rw-r--r-- | tests/auto/tst_qtgraphicaleffects.cpp | 4 |
2 files changed, 5 insertions, 9 deletions
diff --git a/src/effects/private/DropShadowBase.qml b/src/effects/private/DropShadowBase.qml index 8cc259c..3660619 100644 --- a/src/effects/private/DropShadowBase.qml +++ b/src/effects/private/DropShadowBase.qml @@ -46,11 +46,11 @@ Item { id: root property variant source - property int radius: samples / 2 + property real radius: Math.floor(samples / 2) property int samples: 9 property color color: "black" - property int horizontalOffset: 0 - property int verticalOffset: 0 + property real horizontalOffset: 0 + property real verticalOffset: 0 property real spread: 0.0 property bool cached: false property bool transparentBorder: true @@ -59,8 +59,8 @@ Item { id: blur width: parent.width height: parent.height - x: horizontalOffset - y: verticalOffset + x: Math.round(horizontalOffset) + y: Math.round(verticalOffset) source: root.source radius: root.radius samples: root.samples diff --git a/tests/auto/tst_qtgraphicaleffects.cpp b/tests/auto/tst_qtgraphicaleffects.cpp index 8c93f9c..a0104d8 100644 --- a/tests/auto/tst_qtgraphicaleffects.cpp +++ b/tests/auto/tst_qtgraphicaleffects.cpp @@ -457,14 +457,11 @@ void tst_qtgraphicaleffects::dropShadow() QVERIFY(obj != 0); // Default values - QEXPECT_FAIL("", "QTBUG-48625", Continue); QCOMPARE(obj->property("radius").type(), QVariant::Double); QCOMPARE(obj->property("radius").toDouble(), 4.0); QCOMPARE(obj->property("samples").toInt(), 9); - QEXPECT_FAIL("", "QTBUG-48625", Continue); QCOMPARE(obj->property("horizontalOffset").type(), QVariant::Double); QCOMPARE(obj->property("horizontalOffset").toDouble(), 0.0); - QEXPECT_FAIL("", "QTBUG-48625", Continue); QCOMPARE(obj->property("verticalOffset").type(), QVariant::Double); QCOMPARE(obj->property("verticalOffset").toDouble(), 0.0); QCOMPARE(obj->property("cached").toBool(), false); @@ -583,7 +580,6 @@ void tst_qtgraphicaleffects::glow() QVERIFY(obj != 0); // Default values - QEXPECT_FAIL("", "QTBUG-48625", Continue); QCOMPARE(obj->property("radius").type(), QVariant::Double); QCOMPARE(obj->property("radius").toDouble(), 4.0); QCOMPARE(obj->property("samples").toInt(), 9); |