Default: make disable controls easier to see

Task-number: QTBUG-56698
Change-Id: I8e82ee2f2f9c38755e49b6f1b46e9f83a1363463
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>

8 files changed, 4 insertions, 9 deletions

diff --git a/src/imports/controls/Button.qml b/src/imports/controls/Button.qml
index f875a97a..cf1f6c99 100644
--- a/src/imports/controls/Button.qml
+++ b/src/imports/controls/Button.qml
@@ -66,7 +66,6 @@ T.Button {
     background: Rectangle {
         implicitWidth: 100
         implicitHeight: 40
-        opacity: enabled ? 1 : 0.3
         visible: !control.flat || control.down || control.checked || control.highlighted
         color: control.checked || control.highlighted ?
             (control.visualFocus ? (control.down ? "#599bff" : "#0066ff") : (control.down ? "#585a5c" : "#353637")) :
diff --git a/src/imports/controls/CheckBox.qml b/src/imports/controls/CheckBox.qml
index 3615948a..78b42276 100644
--- a/src/imports/controls/CheckBox.qml
+++ b/src/imports/controls/CheckBox.qml
@@ -51,7 +51,7 @@ T.CheckBox {
 
     padding: 6
     spacing: 6
-    opacity: enabled ? 1 : 0.2
+    opacity: enabled ? 1 : 0.3
 
     //! [indicator]
     indicator: CheckIndicator {
diff --git a/src/imports/controls/ComboBox.qml b/src/imports/controls/ComboBox.qml
index 09930aad..791b5da6 100644
--- a/src/imports/controls/ComboBox.qml
+++ b/src/imports/controls/ComboBox.qml
@@ -54,8 +54,6 @@ T.ComboBox {
     leftPadding: padding + 6
     rightPadding: padding + 6
 
-    opacity: enabled ? 1 : 0.3
-
     //! [delegate]
     delegate: ItemDelegate {
         width: control.popup.width
@@ -72,6 +70,7 @@ T.ComboBox {
         source: "image://default/double-arrow/" + (control.visualFocus ? "#0066ff" : "#353637")
         sourceSize.width: width
         sourceSize.height: height
+        opacity: enabled ? 1 : 0.3
     }
     //! [indicator]
 
@@ -86,6 +85,7 @@ T.ComboBox {
         horizontalAlignment: Text.AlignLeft
         verticalAlignment: Text.AlignVCenter
         elide: Text.ElideRight
+        opacity: enabled ? 1 : 0.3
     }
     //! [contentItem]
 
diff --git a/src/imports/controls/RadioButton.qml b/src/imports/controls/RadioButton.qml
index 8a2d7c99..1c63a8de 100644
--- a/src/imports/controls/RadioButton.qml
+++ b/src/imports/controls/RadioButton.qml
@@ -51,7 +51,7 @@ T.RadioButton {
 
     padding: 6
     spacing: 6
-    opacity: enabled ? 1 : 0.2
+    opacity: enabled ? 1 : 0.3
 
     //! [indicator]
     indicator: RadioIndicator {
diff --git a/src/imports/controls/RangeSlider.qml b/src/imports/controls/RangeSlider.qml
index 7353e2b5..dae3ffe7 100644
--- a/src/imports/controls/RangeSlider.qml
+++ b/src/imports/controls/RangeSlider.qml
@@ -88,7 +88,6 @@ T.RangeSlider {
         width: horizontal ? control.availableWidth : implicitWidth
         height: horizontal ? implicitHeight : control.availableHeight
         radius: 3
-        opacity: control.enabled ? 1 : 0.3
         color: "#e0e0e0"
         scale: horizontal && control.mirrored ? -1 : 1
 
diff --git a/src/imports/controls/Slider.qml b/src/imports/controls/Slider.qml
index 896dbca0..31f4a989 100644
--- a/src/imports/controls/Slider.qml
+++ b/src/imports/controls/Slider.qml
@@ -71,7 +71,6 @@ T.Slider {
         width: horizontal ? control.availableWidth : implicitWidth
         height: horizontal ? implicitHeight : control.availableHeight
         radius: 3
-        opacity: control.enabled ? 1 : 0.3
         color: "#e0e0e0"
         scale: horizontal && control.mirrored ? -1 : 1
 
diff --git a/src/imports/controls/SpinBox.qml b/src/imports/controls/SpinBox.qml
index 89853116..de1228d1 100644
--- a/src/imports/controls/SpinBox.qml
+++ b/src/imports/controls/SpinBox.qml
@@ -137,7 +137,6 @@ T.SpinBox {
 
     //! [background]
     background: Rectangle {
-        opacity: control.enabled ? 1 : 0.3
         implicitWidth: 140
         border.color: "#e0e0e0"
     }
diff --git a/src/imports/controls/SwitchIndicator.qml b/src/imports/controls/SwitchIndicator.qml
index f11f7147..261d9999 100644
--- a/src/imports/controls/SwitchIndicator.qml
+++ b/src/imports/controls/SwitchIndicator.qml
@@ -47,7 +47,6 @@ Item {
         width: 56
         height: 16
         radius: 8
-        opacity: control.enabled ? 1 : 0.3
         color: control.checked ? (control.visualFocus ? "#0066ff" : "#353637") : "#e0e0e0"
         border.width: control.visualFocus ? 2 : 0
         border.color: "#0066ff"