diff options
author | Pekka Vuorela <pekka.ta.vuorela@nokia.com> | 2012-01-20 14:07:20 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-27 15:38:09 +0100 |
commit | ed576da6712d881b87a3fffcbddbae925157d265 (patch) | |
tree | 57fc5d5e2fd8ef7fd27fa45e18d5b94771effa4c /src/quick/items/qquicktextedit.cpp | |
parent | 8aa187fec80810d37107341ca6dc53264187ae9d (diff) |
Enhance editors notifying input panel for input method changes
Introduced protected QQuickItem::updateInputMethod() and removed
similar, but badly named updateMicroFocus(). Added some missing
notifications from the editors and avoided unnecessary updates when not
having focus.
Change-Id: Id5c00e87dc26fd35c3f919006817511d4ed6418d
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
Diffstat (limited to 'src/quick/items/qquicktextedit.cpp')
-rw-r--r-- | src/quick/items/qquicktextedit.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/quick/items/qquicktextedit.cpp b/src/quick/items/qquicktextedit.cpp index 37c76c09a3..126003906e 100644 --- a/src/quick/items/qquicktextedit.cpp +++ b/src/quick/items/qquicktextedit.cpp @@ -373,6 +373,7 @@ void QQuickTextEdit::setFont(const QFont &font) } updateSize(); updateDocument(); + updateInputMethod(Qt::ImCursorRectangle | Qt::ImFont); } emit fontChanged(d->sourceFont); } @@ -1248,6 +1249,7 @@ void QQuickTextEdit::setReadOnly(bool r) if (!r) d->control->moveCursor(QTextCursor::End); + updateInputMethod(Qt::ImEnabled); q_canPasteChanged(); emit readOnlyChanged(r); } @@ -1853,7 +1855,7 @@ void QQuickTextEdit::moveCursorDelegate() { Q_D(QQuickTextEdit); d->determineHorizontalAlignment(); - updateMicroFocus(); + updateInputMethod(); emit cursorRectangleChanged(); if (!d->cursor) return; |