diff options
author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-10-10 23:01:53 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-10-11 13:05:36 +0000 |
commit | 57f877bd984a0befb57626421a6e36ed373056ce (patch) | |
tree | ea6162e4fa8806b64b1af0cb4059a6cd0da73d5e /src/templates/qquicktextarea.cpp | |
parent | aa634f86429ad15fced74a5a65e7d170b5e7e9ff (diff) |
TextArea: fix implicit size
Same as 0cb0962 for TextField.
Change-Id: I1538df1b31a8b7254a219923623c5dd586d65059
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/templates/qquicktextarea.cpp')
-rw-r--r-- | src/templates/qquicktextarea.cpp | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/src/templates/qquicktextarea.cpp b/src/templates/qquicktextarea.cpp index 5ea1d911..890e9437 100644 --- a/src/templates/qquicktextarea.cpp +++ b/src/templates/qquicktextarea.cpp @@ -86,11 +86,36 @@ void QQuickTextAreaPrivate::resizeBackground() } } +qreal QQuickTextAreaPrivate::getImplicitWidth() const +{ + return QQuickItemPrivate::getImplicitWidth(); +} + +qreal QQuickTextAreaPrivate::getImplicitHeight() const +{ + return QQuickItemPrivate::getImplicitHeight(); +} + +void QQuickTextAreaPrivate::implicitWidthChanged() +{ + Q_Q(QQuickTextArea); + QQuickItemPrivate::implicitWidthChanged(); + emit q->implicitWidthChanged(); +} + +void QQuickTextAreaPrivate::implicitHeightChanged() +{ + Q_Q(QQuickTextArea); + QQuickItemPrivate::implicitHeightChanged(); + emit q->implicitHeightChanged(); +} + QQuickTextArea::QQuickTextArea(QQuickItem *parent) : QQuickTextEdit(*(new QQuickTextAreaPrivate), parent) { Q_D(QQuickTextArea); setActiveFocusOnTab(true); + d->setImplicitResizeEnabled(false); d->pressAndHoldHelper.control = this; QObjectPrivate::connect(this, &QQuickTextEdit::readOnlyChanged, d, &QQuickTextAreaPrivate::_q_readOnlyChanged); |