aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/TextArea.qml
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2017-09-27 14:08:27 +0200
committerJ-P Nurmi <jpnurmi@qt.io>2017-09-28 12:11:46 +0000
commit97e25d198d6bcd219c0076947163333897c192f2 (patch)
tree187853a462db005a751e838107d0367dc38eaf09 /src/imports/controls/TextArea.qml
parent822e0ccab29651d9eaa8490fe236869557aa32c6 (diff)
Default: palette-based placeholder text color for editors
A half-translucent placeholder text color is also used in widgets. Tweak the default disabled text color a little bit to make placeholder text visible in disabled state, so that we can use the same approach that has been proven to work. ;) Task-number: QTBUG-63369 Change-Id: I9a3f0bf18fdfa4a25ef169b8fd9571c9c899ab26 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/controls/TextArea.qml')
-rw-r--r--src/imports/controls/TextArea.qml3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/imports/controls/TextArea.qml b/src/imports/controls/TextArea.qml
index 1701b9fe..9021d558 100644
--- a/src/imports/controls/TextArea.qml
+++ b/src/imports/controls/TextArea.qml
@@ -65,7 +65,8 @@ T.TextArea {
text: control.placeholderText
font: control.font
- color: enabled ? Default.textPlaceholderColor : Default.textDisabledColor
+ opacity: 0.5
+ color: control.palette.text
verticalAlignment: control.verticalAlignment
visible: !control.length && !control.preeditText && (!control.activeFocus || control.horizontalAlignment !== Qt.AlignHCenter)
elide: Text.ElideRight