diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-06-04 16:11:42 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-06-04 16:11:42 +0200 |
commit | f2c24adbb3e9561bb2f49f9dfa4daf5d5f315f6a (patch) | |
tree | 97a7cb095ec610b4baa5f567dd9e8eeae256543b /src | |
parent | 6ab6f7a1be455d2f56c8f250c349b401056e5580 (diff) | |
parent | 191a2fe59cbaf7603d502fa764b4737f49422010 (diff) | |
download | qtquickcontrols-f2c24adbb3e9561bb2f49f9dfa4daf5d5f315f6a.tar.gz |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
.qmake.conf
Change-Id: I542d108313b1d1566875aed2905ed6b92b9288f0
Diffstat (limited to 'src')
-rw-r--r-- | src/controls/Styles/Base/HandleStyleHelper.qml | 4 | ||||
-rw-r--r-- | src/extras/Private/CircularButtonStyleHelper.qml | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/controls/Styles/Base/HandleStyleHelper.qml b/src/controls/Styles/Base/HandleStyleHelper.qml index 30e62d79..78059bfe 100644 --- a/src/controls/Styles/Base/HandleStyleHelper.qml +++ b/src/controls/Styles/Base/HandleStyleHelper.qml @@ -67,8 +67,8 @@ QtObject { } ctx.beginPath(); - var gradient = ctx.createRadialGradient(handleX, handleY, handleWidth / 2, - handleX, handleY, handleWidth); + var gradient = ctx.createRadialGradient(handleX, handleY, 0, + handleX, handleY, handleWidth * 1.5); gradient.addColorStop(0, handleColorTop); gradient.addColorStop(handleColorBottomStop, handleColorBottom); ctx.ellipse(handleX, handleY, handleWidth, handleHeight); diff --git a/src/extras/Private/CircularButtonStyleHelper.qml b/src/extras/Private/CircularButtonStyleHelper.qml index 55154ae2..713d727f 100644 --- a/src/extras/Private/CircularButtonStyleHelper.qml +++ b/src/extras/Private/CircularButtonStyleHelper.qml @@ -96,7 +96,7 @@ QtObject { ctx.lineWidth = outerArcLineWidth; ctx.arc(xCenter, yCenter, outerArcRadius, 0, Math.PI * 2, false); var gradient = ctx.createRadialGradient(xCenter, yCenter - halfRadius, - halfRadius, xCenter, yCenter - halfRadius, radius); + 0, xCenter, yCenter - halfRadius, radius * 1.5); gradient.addColorStop(0, outerArcColorTop); gradient.addColorStop(1, outerArcColorBottom); ctx.strokeStyle = gradient; @@ -126,8 +126,8 @@ QtObject { /* Draw the button's body */ ctx.beginPath(); ctx.ellipse(xCenter - radius, yCenter - radius, radius * 2, radius * 2); - gradient = ctx.createRadialGradient(xCenter, yCenter + radius * 0.85, radius, - xCenter, yCenter + radius * 0.85, radius * 0.85); + gradient = ctx.createRadialGradient(xCenter, yCenter + radius * 0.85, 0, + xCenter, yCenter + radius * 0.85, radius * (0.85 * 2)); gradient.addColorStop(1, buttonColorTop); gradient.addColorStop(0, buttonColorBottom); ctx.fillStyle = gradient; |