diff options
| author | Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com> | 2015-07-17 14:55:29 +0200 |
|---|---|---|
| committer | Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com> | 2015-07-20 14:43:36 +0000 |
| commit | a73400b55a6f72b9b3be79e3ae1c12fcea8a35ff (patch) | |
| tree | 58873edcbb2ed21fa6212c2d2f0de78c7593e70b /src/imports/controls/TextField.qml | |
| parent | 0c10554a5f2d09346f14e8416fc5b771abd81133 (diff) | |
TextField: Fix sizing issues on the placeholder text element
The properties availableWidth and availableHeight are not
part of QQuickTextField (it doesn't inherit QQuickControl).
Also, the placeholder text may need to be elided if it
doesn't fit.
Change-Id: Ibcae6d9622ba88781de2e6c92447216dc6bdd9e7
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'src/imports/controls/TextField.qml')
| -rw-r--r-- | src/imports/controls/TextField.qml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/imports/controls/TextField.qml b/src/imports/controls/TextField.qml index 57b3eeb2..36d7edbc 100644 --- a/src/imports/controls/TextField.qml +++ b/src/imports/controls/TextField.qml @@ -57,11 +57,12 @@ AbstractTextField { placeholder: Text { x: control.leftPadding y: control.topPadding - width: control.availableWidth - height: control.availableHeight + width: control.width - (control.leftPadding + control.rightPadding) + height: control.height - (control.topPadding + control.bottomPadding) color: control.Theme.disabledColor visible: !control.displayText + elide: Text.ElideRight } //! [placeholder] |