aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@theqtcompany.com>2015-06-16 22:43:20 +0200
committerJ-P Nurmi <jpnurmi@theqtcompany.com>2015-06-16 20:43:56 +0000
commit6a2d7ea011424d77c892229dae4756a8e7a90a88 (patch)
tree723fc7aaff654299e18c6ee670281afc72da9f50
parent52423683d2549d7615e3ffa5a7bf8872e69b826b (diff)
TextField & TextArea: fix placeholder
Change-Id: Ie59899d0f88a940a434b5ac9148ac453066169fd Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
-rw-r--r--src/imports/controls/TextArea.qml4
-rw-r--r--src/imports/controls/TextField.qml4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/imports/controls/TextArea.qml b/src/imports/controls/TextArea.qml
index d63a4cf0..1f83c969 100644
--- a/src/imports/controls/TextArea.qml
+++ b/src/imports/controls/TextArea.qml
@@ -53,8 +53,8 @@ AbstractTextArea {
placeholder: Text {
x: control.leftPadding
y: control.topPadding
- width: control.contentWidth
- height: control.contentHeight
+ width: control.width - control.leftPadding - control.rightPadding
+ height: control.height - control.topPadding - control.bottomPadding
color: control.Theme.textColor
opacity: control.Theme.disabledOpacity
diff --git a/src/imports/controls/TextField.qml b/src/imports/controls/TextField.qml
index 23c0868d..37802184 100644
--- a/src/imports/controls/TextField.qml
+++ b/src/imports/controls/TextField.qml
@@ -56,8 +56,8 @@ AbstractTextField {
placeholder: Text {
x: control.leftPadding
y: control.topPadding
- width: control.contentWidth
- height: control.contentHeight
+ width: control.width - control.leftPadding - control.rightPadding
+ height: control.height - control.topPadding - control.bottomPadding
color: control.Theme.textColor
opacity: control.Theme.disabledOpacity