diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-07-22 10:25:24 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-07-22 15:19:36 +0000 |
| commit | cc0ee8e4f3345023f1b85fc815739c0a75ea5686 (patch) | |
| tree | 87ee5d35c23f3ea44f0737867221d794646d3a02 /src/quicktemplates2 | |
| parent | 92032bee2923024d126bc20929f79abd459cae49 (diff) | |
Flickable TextArea: don't intercept input events outside visual bounds
Task-number: QTBUG-54897
Change-Id: I4e5cd0e175fa5dc2399bb80150ac538912a5b542
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/quicktemplates2')
| -rw-r--r-- | src/quicktemplates2/qquicktextarea.cpp | 8 | ||||
| -rw-r--r-- | src/quicktemplates2/qquicktextarea_p.h | 2 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/quicktemplates2/qquicktextarea.cpp b/src/quicktemplates2/qquicktextarea.cpp index de69a279..b72a9b57 100644 --- a/src/quicktemplates2/qquicktextarea.cpp +++ b/src/quicktemplates2/qquicktextarea.cpp @@ -471,6 +471,14 @@ void QQuickTextArea::setFocusReason(Qt::FocusReason reason) emit focusReasonChanged(); } +bool QQuickTextArea::contains(const QPointF &point) const +{ + Q_D(const QQuickTextArea); + if (d->flickable && !d->flickable->contains(d->flickable->mapFromItem(this, point))) + return false; + return QQuickTextEdit::contains(point); +} + void QQuickTextArea::classBegin() { Q_D(QQuickTextArea); diff --git a/src/quicktemplates2/qquicktextarea_p.h b/src/quicktemplates2/qquicktextarea_p.h index 95aa61cf..f00943aa 100644 --- a/src/quicktemplates2/qquicktextarea_p.h +++ b/src/quicktemplates2/qquicktextarea_p.h @@ -86,6 +86,8 @@ public: Qt::FocusReason focusReason() const; void setFocusReason(Qt::FocusReason reason); + bool contains(const QPointF &point) const override; + Q_SIGNALS: void fontChanged(); void implicitWidthChanged3(); |