diff options
author | Mitch Curtis <mitch.curtis@theqtcompany.com> | 2016-04-12 16:19:58 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-04-15 14:45:47 +0000 |
commit | eae24fccc57437170e2ba01b894fa24fe65292be (patch) | |
tree | dfbd1450c237df8c2cd08838d2f054ef029ceea8 /src/imports/controls/universal/RadioIndicator.qml | |
parent | 0fe0283308199a6bf4a155627cddd524638c7063 (diff) |
Add QQuickAbstractButton::down
This property will determine whether or not the button is visually
pressed. Having such a distinction allows users more control over their
controls.
The patch also fixes the problem with ComboBox where pressing on the
ComboBox when it's open would cause a delegate in the popup to show as
being pressed.
Unless explicitly set, this property follows the value of the pressed
property. To return to the default value, set it to undefined.
Change-Id: I29ecf325ed2ede125613f0c878b0427937599866
Task-number: QTBUG-51005
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/imports/controls/universal/RadioIndicator.qml')
-rw-r--r-- | src/imports/controls/universal/RadioIndicator.qml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/imports/controls/universal/RadioIndicator.qml b/src/imports/controls/universal/RadioIndicator.qml index d107da96..3fd74cbf 100644 --- a/src/imports/controls/universal/RadioIndicator.qml +++ b/src/imports/controls/universal/RadioIndicator.qml @@ -45,7 +45,7 @@ Rectangle { border.width: 2 // RadioButtonBorderThemeThickness border.color: control.checked ? "transparent" : !control.enabled ? control.Universal.baseLowColor : - control.pressed ? control.Universal.baseMediumColor : control.Universal.baseMediumHighColor + control.down ? control.Universal.baseMediumColor : control.Universal.baseMediumHighColor property var control @@ -59,7 +59,7 @@ Rectangle { color: "transparent" border.width: 2 // RadioButtonBorderThemeThickness border.color: !control.enabled ? control.Universal.baseLowColor : - control.pressed ? control.Universal.baseMediumColor : control.Universal.accent + control.down ? control.Universal.baseMediumColor : control.Universal.accent } Rectangle { @@ -72,6 +72,6 @@ Rectangle { radius: width / 2 opacity: control.checked ? 1 : 0 color: !control.enabled ? control.Universal.baseLowColor : - control.pressed ? control.Universal.baseMediumColor : control.Universal.baseMediumHighColor + control.down ? control.Universal.baseMediumColor : control.Universal.baseMediumHighColor } } |