diff options
| author | Pekka Vuorela <pekka.ta.vuorela@nokia.com> | 2011-12-09 15:15:21 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-14 11:53:32 +0100 |
| commit | 85328b975027c6e26bcaf2dd660acd3118049fd2 (patch) | |
| tree | 64a241bc3155f01227a7c2867ae358005e75005e /src/quick/items/qquicktextcontrol.cpp | |
| parent | b0133b8fa4b1ad9a887fa6718983711b560a35ef (diff) | |
TextEdits to include tentative commit in text property
Similar to what qtbase 1dbfbf4c66187e7522888c19d78024cfceaea570
did for QTextEdit. Now available only in plain text, html support
pending.
Change-Id: I0b23a45fc484512d3354f66e1a6134e2d70eb8b5
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/qquicktextcontrol.cpp')
| -rw-r--r-- | src/quick/items/qquicktextcontrol.cpp | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/src/quick/items/qquicktextcontrol.cpp b/src/quick/items/qquicktextcontrol.cpp index cd4d853a88..436b6b7ae9 100644 --- a/src/quick/items/qquicktextcontrol.cpp +++ b/src/quick/items/qquicktextcontrol.cpp @@ -1869,7 +1869,10 @@ void QQuickTextControlPrivate::inputMethodEvent(QInputMethodEvent *e) } } layout->setAdditionalFormats(overrides); + tentativeCommit = e->tentativeCommitString(); + cursor.endEditBlock(); + QTextCursorPrivate *cursor_d = QTextCursorPrivate::getPrivate(&cursor); if (cursor_d) cursor_d->setX(); @@ -2696,6 +2699,22 @@ void QQuickTextControl::appendPlainText(const QString &text) d->append(text, Qt::PlainText); } +QString QQuickTextControl::toPlainText() const +{ + Q_D(const QQuickTextControl); + QString plainText = document()->toPlainText(); + if (!d->tentativeCommit.isEmpty()) + plainText.insert(textCursor().position(), d->tentativeCommit); + return plainText; +} + +#ifndef QT_NO_TEXTHTMLPARSER +QString QQuickTextControl::toHtml() const +{ + // note: currently not including tentative commit + return document()->toHtml(); +} +#endif void QQuickTextControl::ensureCursorVisible() { |