diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2016-10-26 12:48:58 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-10-26 16:43:55 +0000 |
| commit | a66e08da7681f7301e23c55fd1f40ef8461f0896 (patch) | |
| tree | b9f45c91b994f5af251e559e7de055d367f6a9ed /src/imports | |
| parent | 1b7ac95bc0296301dee0846e0ea4381c762d8a33 (diff) | |
Default: move opacity assignments to individual delegates
This way, users have control over the opacity of child items.
Change-Id: Ie7c0b08eb0b22d11319f8c2f1807e6a3a68790ea
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/controls/CheckBox.qml | 2 | ||||
| -rw-r--r-- | src/imports/controls/CheckIndicator.qml | 1 | ||||
| -rw-r--r-- | src/imports/controls/RadioButton.qml | 2 | ||||
| -rw-r--r-- | src/imports/controls/RadioIndicator.qml | 1 |
4 files changed, 4 insertions, 2 deletions
diff --git a/src/imports/controls/CheckBox.qml b/src/imports/controls/CheckBox.qml index 78b42276..52ce20ef 100644 --- a/src/imports/controls/CheckBox.qml +++ b/src/imports/controls/CheckBox.qml @@ -51,7 +51,6 @@ T.CheckBox { padding: 6 spacing: 6 - opacity: enabled ? 1 : 0.3 //! [indicator] indicator: CheckIndicator { @@ -73,6 +72,7 @@ T.CheckBox { visible: control.text horizontalAlignment: Text.AlignLeft verticalAlignment: Text.AlignVCenter + opacity: enabled ? 1 : 0.3 } //! [contentItem] } diff --git a/src/imports/controls/CheckIndicator.qml b/src/imports/controls/CheckIndicator.qml index d78e9e30..5aad92ef 100644 --- a/src/imports/controls/CheckIndicator.qml +++ b/src/imports/controls/CheckIndicator.qml @@ -47,6 +47,7 @@ Rectangle { color: control.enabled ? (control.down ? (control.visualFocus ? "#cce0ff" : "#f6f6f6") : "#ffffff") : "#353637" border.width: control.visualFocus ? 2 : 1 border.color: control.enabled ? (control.visualFocus ? "#0066ff" : (control.down ? "#808080" : "#909090")) : "transparent" + opacity: enabled ? 1 : 0.3 Image { x: (parent.width - width) / 2 diff --git a/src/imports/controls/RadioButton.qml b/src/imports/controls/RadioButton.qml index 1c63a8de..a1a5d1a1 100644 --- a/src/imports/controls/RadioButton.qml +++ b/src/imports/controls/RadioButton.qml @@ -51,7 +51,6 @@ T.RadioButton { padding: 6 spacing: 6 - opacity: enabled ? 1 : 0.3 //! [indicator] indicator: RadioIndicator { @@ -73,6 +72,7 @@ T.RadioButton { visible: control.text horizontalAlignment: Text.AlignLeft verticalAlignment: Text.AlignVCenter + opacity: enabled ? 1 : 0.3 } //! [contentItem] } diff --git a/src/imports/controls/RadioIndicator.qml b/src/imports/controls/RadioIndicator.qml index 08c24cc5..05ff6673 100644 --- a/src/imports/controls/RadioIndicator.qml +++ b/src/imports/controls/RadioIndicator.qml @@ -44,6 +44,7 @@ Rectangle { color: control.down ? (control.visualFocus ? "#cce0ff" : "#f6f6f6") : (control.visualFocus ? "#f0f6ff" : "#ffffff") border.width: control.visualFocus ? 2 : 1 border.color: control.visualFocus ? "#0066ff" : (control.down ? "#808080" : "#909090") + opacity: enabled ? 1 : 0.3 property Item control |