diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2018-01-11 13:29:23 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2018-01-11 13:28:19 +0000 |
| commit | 589d52b3b64a4b5221738a28df08be2eae4d12b2 (patch) | |
| tree | 070662b7a0c46beb23fd195ad2a2c03fd91aad5b /src/imports/controls/fusion/RoundButton.qml | |
| parent | 772c01c0ced1c3420b2c8fb3ec4b4bbc898b7d6a (diff) | |
Fusion: eliminate internal IDs to enable deferred execution
Task-number: QTBUG-65341
Change-Id: I3bfd36f1d1e275eb507184c376599aa7751a069e
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
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 390f78f3..981a44ab 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)) } } |