diff options
| author | Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com> | 2009-09-15 13:21:33 (GMT) |
|---|---|---|
| committer | Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com> | 2009-09-15 13:21:33 (GMT) |
| commit | b13365187b58ecc2d259589ab523a7d0da84dc83 (patch) | |
| tree | b9faa53420fba2e0f4249449b5c997cf26477cdf /src/declarative/fx/qfxitem.h | |
| parent | edf7c7c045559b1d03f1d64d2334adac7da88527 (diff) | |
| download | Qt-b13365187b58ecc2d259589ab523a7d0da84dc83.zip Qt-b13365187b58ecc2d259589ab523a7d0da84dc83.tar.gz Qt-b13365187b58ecc2d259589ab523a7d0da84dc83.tar.bz2 | |
Focus changes to QFxItem and QFxView.
Remove QFxItem::activeFocus, make QFxItem::focus behave like
QGraphicsItem::focus (same as activeFocus essentially). Introduce
QFxItem::wantsFocus to provide the same behavior as QFxItem::focus used
to.
Also updated the focusScope manual tests to reflect this new behavior.
This change is going to break every example that relies on activeFocus.
The fix is to replace all references with "focus" instead. All places
that bind to "focus" should now bind to "wantsFocus" instead.
Reviewed-by: akennedy
Diffstat (limited to 'src/declarative/fx/qfxitem.h')
| -rw-r--r-- | src/declarative/fx/qfxitem.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/declarative/fx/qfxitem.h b/src/declarative/fx/qfxitem.h index c6a5311..7ec1ab2 100644 --- a/src/declarative/fx/qfxitem.h +++ b/src/declarative/fx/qfxitem.h @@ -89,7 +89,7 @@ class Q_DECLARATIVE_EXPORT QFxItem : public QGraphicsObject, public QmlParserSta Q_PROPERTY(qreal baselineOffset READ baselineOffset WRITE setBaselineOffset NOTIFY baselineOffsetChanged) Q_PROPERTY(bool clip READ clip WRITE setClip) // ### move to QGI/QGO, NOTIFY Q_PROPERTY(bool focus READ hasFocus WRITE setFocus NOTIFY focusChanged FINAL) - Q_PROPERTY(bool activeFocus READ hasActiveFocus NOTIFY activeFocusChanged FINAL) + Q_PROPERTY(bool wantsFocus READ wantsFocus NOTIFY wantsFocusChanged) Q_PROPERTY(QmlList<QGraphicsTransform *>* transform READ transform DESIGNABLE false FINAL) Q_PROPERTY(TransformOrigin transformOrigin READ transformOrigin WRITE setTransformOrigin) Q_PROPERTY(bool smooth READ smoothTransform WRITE setSmoothTransform) @@ -147,9 +147,9 @@ public: QRectF boundingRect() const; virtual void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *); - virtual bool hasFocus() const; + bool wantsFocus() const; + bool hasFocus() const; void setFocus(bool); - bool hasActiveFocus() const; bool keepMouseGrab() const; void setKeepMouseGrab(bool); @@ -161,6 +161,7 @@ Q_SIGNALS: void baselineOffsetChanged(); void stateChanged(const QString &); void focusChanged(); + void wantsFocusChanged(); void activeFocusChanged(); void parentChanged(); |