diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-09-21 09:55:33 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-09-21 09:55:46 +0200 |
| commit | 55b09bbc484b15d341746d65fd68d35f2e32e535 (patch) | |
| tree | 10292ec7e329dea806eda5ed18f70b57f02dca8b /src/imports/controls/TextArea.qml | |
| parent | 23c5ae751c86eee1a256aad3afe37f4757100f97 (diff) | |
| parent | 391cba9a1e7fc6b2c8a26e4fbcab90a2bf670e78 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: I237813241b35445d3372b84b0ef2759f3d2c5bcc
Diffstat (limited to 'src/imports/controls/TextArea.qml')
| -rw-r--r-- | src/imports/controls/TextArea.qml | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/imports/controls/TextArea.qml b/src/imports/controls/TextArea.qml index f6c01c6c..37802665 100644 --- a/src/imports/controls/TextArea.qml +++ b/src/imports/controls/TextArea.qml @@ -52,8 +52,7 @@ T.TextArea { padding: 6 leftPadding: padding + 4 - opacity: enabled ? 1 : 0.2 - color: Default.textColor + color: enabled ? Default.textColor : Default.textDisabledLightColor selectionColor: Default.textSelectionColor selectedTextColor: color @@ -66,7 +65,7 @@ T.TextArea { text: control.placeholderText font: control.font - color: Default.textDisabledLightColor + color: enabled ? Default.textPlaceholderColor : Default.textDisabledColor verticalAlignment: control.verticalAlignment visible: !control.length && !control.preeditText && (!control.activeFocus || control.horizontalAlignment !== Qt.AlignHCenter) elide: Text.ElideRight |