Simplify TextField & TextArea placeholder

Better not expose the extra Text item in the API. Ideally it should
be implemented as a scenegraph node. We might even want to promote
the placeholderText property (and add placeholderColor) to TextInput
and TextEdit in Qt Quick core.

Change-Id: I4f443c77d1c696b87a50ee184f868713dd50316f
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>

1 files changed, 5 insertions, 5 deletions

diff --git a/src/imports/controls/TextArea.qml b/src/imports/controls/TextArea.qml
index c4c7833d..564bd108 100644
--- a/src/imports/controls/TextArea.qml
+++ b/src/imports/controls/TextArea.qml
@@ -43,10 +43,10 @@ T.TextArea {
 
     implicitWidth: Math.max(contentWidth + leftPadding + rightPadding,
                             background ? background.implicitWidth : 0,
-                            placeholder ? placeholder.implicitWidth + leftPadding + rightPadding : 0)
+                            placeholder.implicitWidth + leftPadding + rightPadding)
     implicitHeight: Math.max(contentHeight + topPadding + bottomPadding,
                              background ? background.implicitHeight : 0,
-                             placeholder ? placeholder.implicitHeight + topPadding + bottomPadding : 0)
+                             placeholder.implicitHeight + topPadding + bottomPadding)
 
     padding: 6
 
@@ -54,13 +54,14 @@ T.TextArea {
     selectionColor: Theme.selectionColor
     selectedTextColor: Theme.selectedTextColor
 
-    //! [placeholder]
-    placeholder: Text {
+    Text {
+        id: placeholder
         x: control.leftPadding
         y: control.topPadding
         width: control.width - (control.leftPadding + control.rightPadding)
         height: control.height - (control.topPadding + control.bottomPadding)
 
+        text: control.placeholderText
         font: control.font
         color: control.Theme.disabledColor
         horizontalAlignment: control.horizontalAlignment
@@ -68,5 +69,4 @@ T.TextArea {
         visible: !control.length
         elide: Text.ElideRight
     }
-    //! [placeholder]
 }