aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/TextArea.qml
diff options
context:
space:
mode:
authorMitch Curtis <mitch.curtis@qt.io>2017-09-19 10:32:18 +0200
committerMitch Curtis <mitch.curtis@qt.io>2017-09-19 09:16:57 +0000
commit391cba9a1e7fc6b2c8a26e4fbcab90a2bf670e78 (patch)
treeeae7a3b6d15163f04702343da8264e418252ebf0 /src/imports/controls/TextArea.qml
parentd3aef722da533c3b100ba653498c79986a44c9f9 (diff)
Default: improve TextField and TextArea styling
- Remove top-level opacity assignments to allow full customization - Add more distinction between disable and placeholder text - Make disabled text more visible Task-number: QTBUG-62854 Change-Id: I2e8998fb739e4beda58978173173ca94a3759caf Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'src/imports/controls/TextArea.qml')
-rw-r--r--src/imports/controls/TextArea.qml5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/imports/controls/TextArea.qml b/src/imports/controls/TextArea.qml
index cbba5912..ed83fb7d 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