aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2018-02-05 14:39:43 +0100
committerJ-P Nurmi <jpnurmi@qt.io>2018-02-05 14:31:05 +0000
commitb9584b13d53f36da5585051346d03a86650961bc (patch)
tree93c344aae11965802f04e356a34236765862eb3e
parent3c0f3ed5d5819a927d259e0dda7b3245cf43b110 (diff)
Editors: tweak placeholder text color
Instead of using 50% translucent palette.text, use 50% translucent TextField::color (which defaults to palette.text) to make the placeholder text color follow the text color when changed directly without changing the palette. In the future, the placeholder text color should be exposed as a separate property to give users full control. Task-number: QTBUG-66176 Change-Id: I57153ff676be6518f9b48cdbd7da4089daa36853 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
-rw-r--r--src/imports/controls/TextArea.qml2
-rw-r--r--src/imports/controls/TextField.qml2
-rw-r--r--src/imports/controls/fusion/TextArea.qml2
-rw-r--r--src/imports/controls/fusion/TextField.qml2
-rw-r--r--src/imports/controls/imagine/TextArea.qml2
-rw-r--r--src/imports/controls/imagine/TextField.qml2
6 files changed, 6 insertions, 6 deletions
diff --git a/src/imports/controls/TextArea.qml b/src/imports/controls/TextArea.qml
index 9021d558..2bda4ca9 100644
--- a/src/imports/controls/TextArea.qml
+++ b/src/imports/controls/TextArea.qml
@@ -66,7 +66,7 @@ T.TextArea {
text: control.placeholderText
font: control.font
opacity: 0.5
- color: control.palette.text
+ color: control.color
verticalAlignment: control.verticalAlignment
visible: !control.length && !control.preeditText && (!control.activeFocus || control.horizontalAlignment !== Qt.AlignHCenter)
elide: Text.ElideRight
diff --git a/src/imports/controls/TextField.qml b/src/imports/controls/TextField.qml
index 52125501..cbecd198 100644
--- a/src/imports/controls/TextField.qml
+++ b/src/imports/controls/TextField.qml
@@ -67,7 +67,7 @@ T.TextField {
text: control.placeholderText
font: control.font
opacity: 0.5
- color: control.palette.text
+ color: control.color
verticalAlignment: control.verticalAlignment
visible: !control.length && !control.preeditText && (!control.activeFocus || control.horizontalAlignment !== Qt.AlignHCenter)
elide: Text.ElideRight
diff --git a/src/imports/controls/fusion/TextArea.qml b/src/imports/controls/fusion/TextArea.qml
index 6d47e237..6fc74660 100644
--- a/src/imports/controls/fusion/TextArea.qml
+++ b/src/imports/controls/fusion/TextArea.qml
@@ -68,7 +68,7 @@ T.TextArea {
opacity: 0.5
text: control.placeholderText
font: control.font
- color: control.palette.text
+ color: control.color
verticalAlignment: control.verticalAlignment
visible: !control.length && !control.preeditText && (!control.activeFocus || control.horizontalAlignment !== Qt.AlignHCenter)
elide: Text.ElideRight
diff --git a/src/imports/controls/fusion/TextField.qml b/src/imports/controls/fusion/TextField.qml
index 686690bb..aef8475b 100644
--- a/src/imports/controls/fusion/TextField.qml
+++ b/src/imports/controls/fusion/TextField.qml
@@ -68,7 +68,7 @@ T.TextField {
opacity: 0.5
text: control.placeholderText
font: control.font
- color: control.palette.text
+ color: control.color
verticalAlignment: control.verticalAlignment
visible: !control.length && !control.preeditText && (!control.activeFocus || control.horizontalAlignment !== Qt.AlignHCenter)
elide: Text.ElideRight
diff --git a/src/imports/controls/imagine/TextArea.qml b/src/imports/controls/imagine/TextArea.qml
index ac212b95..a0e60230 100644
--- a/src/imports/controls/imagine/TextArea.qml
+++ b/src/imports/controls/imagine/TextArea.qml
@@ -70,7 +70,7 @@ T.TextArea {
text: control.placeholderText
font: control.font
- color: control.palette.text
+ color: control.color
verticalAlignment: control.verticalAlignment
visible: !control.length && !control.preeditText && (!control.activeFocus || control.horizontalAlignment !== Qt.AlignHCenter)
elide: Text.ElideRight
diff --git a/src/imports/controls/imagine/TextField.qml b/src/imports/controls/imagine/TextField.qml
index a6449884..024698f8 100644
--- a/src/imports/controls/imagine/TextField.qml
+++ b/src/imports/controls/imagine/TextField.qml
@@ -70,7 +70,7 @@ T.TextField {
text: control.placeholderText
font: control.font
- color: control.palette.text
+ color: control.color
verticalAlignment: control.verticalAlignment
visible: !control.length && !control.preeditText && (!control.activeFocus || control.horizontalAlignment !== Qt.AlignHCenter)
elide: Text.ElideRight