diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-11-29 23:35:17 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-12-12 17:47:21 +0000 |
| commit | 691366a678640448c1dcb04f5297f637919aa220 (patch) | |
| tree | 8931979e244b489d4e1bb60d7d79c80e561871e5 /src/templates/qquicktextarea_p.h | |
| parent | 0cb8763ca7dc3190a797563ff64c35f9208aa9c8 (diff) | |
Add QQuickControl::focusReason
This allows the Universal style ApplicationWindow to visualize key/tab
focus with a focus rectangle, but hide the focus rectangle when the
focus moves around for other reasons (mouse, active window, popups...)
Change-Id: I5c5b43d7c4c051679e34b806ee43cd80180d7ab8
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/templates/qquicktextarea_p.h')
| -rw-r--r-- | src/templates/qquicktextarea_p.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/templates/qquicktextarea_p.h b/src/templates/qquicktextarea_p.h index d8326f66..74eb54dc 100644 --- a/src/templates/qquicktextarea_p.h +++ b/src/templates/qquicktextarea_p.h @@ -65,6 +65,7 @@ class Q_LABSTEMPLATES_EXPORT QQuickTextArea : public QQuickTextEdit Q_PROPERTY(qreal implicitHeight READ implicitHeight WRITE setImplicitHeight NOTIFY implicitHeightChanged FINAL) Q_PROPERTY(QQuickItem *background READ background WRITE setBackground NOTIFY backgroundChanged FINAL) Q_PROPERTY(QString placeholderText READ placeholderText WRITE setPlaceholderText NOTIFY placeholderTextChanged FINAL) + Q_PROPERTY(Qt::FocusReason focusReason READ focusReason WRITE setFocusReason NOTIFY focusReasonChanged FINAL) public: explicit QQuickTextArea(QQuickItem *parent = Q_NULLPTR); @@ -79,12 +80,16 @@ public: QString placeholderText() const; void setPlaceholderText(const QString &text); + Qt::FocusReason focusReason() const; + void setFocusReason(Qt::FocusReason reason); + Q_SIGNALS: void fontChanged(); void implicitWidthChanged(); void implicitHeightChanged(); void backgroundChanged(); void placeholderTextChanged(); + void focusReasonChanged(); void pressAndHold(QQuickMouseEvent *event); protected: @@ -93,6 +98,9 @@ protected: void itemChange(ItemChange change, const ItemChangeData &value) Q_DECL_OVERRIDE; void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) Q_DECL_OVERRIDE; QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *data) Q_DECL_OVERRIDE; + + void focusInEvent(QFocusEvent *event) Q_DECL_OVERRIDE; + void focusOutEvent(QFocusEvent *event) Q_DECL_OVERRIDE; void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE; void mouseMoveEvent(QMouseEvent *event) Q_DECL_OVERRIDE; void mouseReleaseEvent(QMouseEvent *event) Q_DECL_OVERRIDE; |