diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2018-01-16 09:37:42 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2018-01-16 09:38:19 +0100 |
| commit | 08e6333450bc28c61fa804101df3ae8bef4e9568 (patch) | |
| tree | acb8973cbbd2319ab75e460e35a3278459d717df /src/imports/controls/fusion/RoundButton.qml | |
| parent | ef5e426bed3b1362394c7cc0c97522bb20cacff0 (diff) | |
| parent | 744d14b468eb4bdd4dabf72ef7acdca1bc07ea5d (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Change-Id: Ibd1490e8d958361e55ac272dff75c9361239958b
Diffstat (limited to 'src/imports/controls/fusion/RoundButton.qml')
| -rw-r--r-- | src/imports/controls/fusion/RoundButton.qml | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/imports/controls/fusion/RoundButton.qml b/src/imports/controls/fusion/RoundButton.qml index 9ebc74dd..5d28b52c 100644 --- a/src/imports/controls/fusion/RoundButton.qml +++ b/src/imports/controls/fusion/RoundButton.qml @@ -72,18 +72,16 @@ T.RoundButton { implicitHeight: 32 visible: !control.flat || control.down || control.checked - color: Fusion.buttonColor(control.palette, control.highlighted, control.down || control.checked, control.hovered) - gradient: control.down || control.checked ? null : buttonGradient - - Gradient { - id: buttonGradient + gradient: Gradient { GradientStop { position: 0 - color: Fusion.gradientStart(Fusion.buttonColor(control.palette, control.highlighted, control.down, control.hovered)) + color: control.down || control.checked ? Fusion.buttonColor(control.palette, control.highlighted, control.down || control.checked, control.hovered) + : Fusion.gradientStart(Fusion.buttonColor(control.palette, control.highlighted, control.down, control.hovered)) } GradientStop { position: 1 - color: Fusion.gradientStop(Fusion.buttonColor(control.palette, control.highlighted, control.down, control.hovered)) + color: control.down || control.checked ? Fusion.buttonColor(control.palette, control.highlighted, control.down || control.checked, control.hovered) + : Fusion.gradientStop(Fusion.buttonColor(control.palette, control.highlighted, control.down, control.hovered)) } } |