diff options
| author | Martin Jones <martin.jones@nokia.com> | 2011-03-01 23:26:13 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2011-03-01 23:26:13 (GMT) |
| commit | 95814418f9d6adeba365c795462e8afb00138211 (patch) | |
| tree | f7528ae97d136474ae300daa513acc0250f02d4e /src/declarative/graphicsitems/qdeclarativetextinput_p.h | |
| parent | 88253db8a7d7910e1393b1948fb3747117538c92 (diff) | |
| parent | 119a8ddcd7c8de0607309b37f9ef83439b607f17 (diff) | |
| download | Qt-95814418f9d6adeba365c795462e8afb00138211.zip Qt-95814418f9d6adeba365c795462e8afb00138211.tar.gz Qt-95814418f9d6adeba365c795462e8afb00138211.tar.bz2 | |
Merge branch '4.7' into qtquick11
Conflicts:
src/declarative/graphicsitems/qdeclarativelistview.cpp
Change-Id: Ic21311365c6139520ae337a379bdedb6ffe497db
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativetextinput_p.h')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativetextinput_p.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativetextinput_p.h b/src/declarative/graphicsitems/qdeclarativetextinput_p.h index a3e8d29..c057f1f 100644 --- a/src/declarative/graphicsitems/qdeclarativetextinput_p.h +++ b/src/declarative/graphicsitems/qdeclarativetextinput_p.h @@ -97,6 +97,7 @@ class Q_AUTOTEST_EXPORT QDeclarativeTextInput : public QDeclarativeImplicitSizeP Q_PROPERTY(bool selectByMouse READ selectByMouse WRITE setSelectByMouse NOTIFY selectByMouseChanged) Q_PROPERTY(SelectionMode mouseSelectionMode READ mouseSelectionMode WRITE setMouseSelectionMode NOTIFY mouseSelectionModeChanged REVISION 1) Q_PROPERTY(bool canPaste READ canPaste NOTIFY canPasteChanged REVISION 1) + Q_PROPERTY(bool inputMethodComposing READ isInputMethodComposing NOTIFY inputMethodComposingChanged REVISION 1) public: QDeclarativeTextInput(QDeclarativeItem* parent=0); @@ -120,8 +121,14 @@ public: SelectWords }; + enum CursorPosition { + CursorBetweenCharacters, + CursorOnCharacter + }; + //Auxilliary functions needed to control the TextInput from QML Q_INVOKABLE int positionAt(int x) const; + Q_INVOKABLE Q_REVISION(1) int positionAt(int x, CursorPosition position) const; Q_INVOKABLE QRectF positionToRectangle(int pos) const; Q_INVOKABLE void moveCursorSelection(int pos); Q_INVOKABLE Q_REVISION(1) void moveCursorSelection(int pos, SelectionMode mode); @@ -205,6 +212,8 @@ public: QRectF boundingRect() const; bool canPaste() const; + bool isInputMethodComposing() const; + Q_SIGNALS: void textChanged(); void cursorPositionChanged(); @@ -232,6 +241,7 @@ Q_SIGNALS: void selectByMouseChanged(bool selectByMouse); Q_REVISION(1) void mouseSelectionModeChanged(SelectionMode mode); Q_REVISION(1) void canPasteChanged(); + Q_REVISION(1) void inputMethodComposingChanged(); protected: virtual void geometryChanged(const QRectF &newGeometry, |