summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMitch Curtis <mitch.curtis@qt.io>2018-05-24 10:24:46 +0200
committerMitch Curtis <mitch.curtis@qt.io>2018-05-24 14:06:05 +0000
commit4aec7d14d57b10f7fc503644d3cad44d9f166322 (patch)
treeead09dab5abc95edffbe2d550c89314e780fa85c
parent4c6f7c9321e1b080ea0ac883a9306ee569b9ec7b (diff)
downloadqtquickcontrols-4aec7d14d57b10f7fc503644d3cad44d9f166322.tar.gz
StatusIndicatorStyle: fix usage of ctx.createRadialGradient()
be4c4877b35ad1b6983cf194e61f0dad1d123af5 fixed Context2D's createRadialGradient() function, so our usage of it has to be updated accordingly. This patch results in the same visual result as it was originally (before the auto test failure). Task-number: QTBUG-68301 Change-Id: Ibd8aa24e84ceecccf25d7656350738a38cd03e24 Reviewed-by: Andy Shaw <andy.shaw@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
-rw-r--r--src/controls/Styles/Base/StatusIndicatorStyle.qml2
-rw-r--r--tests/auto/extras/BLACKLIST6
2 files changed, 1 insertions, 7 deletions
diff --git a/src/controls/Styles/Base/StatusIndicatorStyle.qml b/src/controls/Styles/Base/StatusIndicatorStyle.qml
index c12ab507..a334aa62 100644
--- a/src/controls/Styles/Base/StatusIndicatorStyle.qml
+++ b/src/controls/Styles/Base/StatusIndicatorStyle.qml
@@ -204,7 +204,7 @@ Style {
gradient.addColorStop(1.0, "transparent");
} else {
// Draw the radial shine.
- gradient = ctx.createRadialGradient(width / 2, height / 2, width * 0.25, width / 2, height / 2, width * 0.25);
+ gradient = ctx.createRadialGradient(width / 2, height / 2, 0, width / 2, height / 2, width * 0.5 /* (same as height) */);
gradient.addColorStop(0.0, Qt.lighter(baseColor, 1.4));
gradient.addColorStop(1.0, "transparent");
}
diff --git a/tests/auto/extras/BLACKLIST b/tests/auto/extras/BLACKLIST
deleted file mode 100644
index 28325efd..00000000
--- a/tests/auto/extras/BLACKLIST
+++ /dev/null
@@ -1,6 +0,0 @@
-[Tests_StatusIndicator::test_active]
-*
-[Tests_StatusIndicator::test_baseStyleHasOuterShadow]
-*
-[Tests_StatusIndicator::test_color]
-*