diff options
| author | Pekka Vuorela <pekka.ta.vuorela@nokia.com> | 2011-11-07 11:52:56 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-10 13:07:20 +0100 |
| commit | 1dbfbf4c66187e7522888c19d78024cfceaea570 (patch) | |
| tree | 84eb001b1078eb29cc7589115ce87b278ca365ae /src/widgets/widgets/qwidgettextcontrol.cpp | |
| parent | 77082cd7c91905aaffcf341ab55adb07839aa33e (diff) | |
Implement partial tentativeCommit support in QTextEdit
Available on plain text for now, html support still pending.
Change-Id: I0818b97874e80c8c1b33a9127aa7bb3330a8761d
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/widgets/widgets/qwidgettextcontrol.cpp')
| -rw-r--r-- | src/widgets/widgets/qwidgettextcontrol.cpp | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/src/widgets/widgets/qwidgettextcontrol.cpp b/src/widgets/widgets/qwidgettextcontrol.cpp index d48ee9a2ae..b6432ee53f 100644 --- a/src/widgets/widgets/qwidgettextcontrol.cpp +++ b/src/widgets/widgets/qwidgettextcontrol.cpp @@ -1991,7 +1991,10 @@ void QWidgetTextControlPrivate::inputMethodEvent(QInputMethodEvent *e) } } layout->setAdditionalFormats(overrides); + tentativeCommit = e->tentativeCommitString(); + cursor.endEditBlock(); + if (cursor.d) cursor.d->setX(); if (oldPreeditCursor != preeditCursor) @@ -2909,7 +2912,22 @@ bool QWidgetTextControl::find(const QString &exp, QTextDocument::FindFlags optio return true; } +QString QWidgetTextControl::toPlainText() const +{ + Q_D(const QWidgetTextControl); + QString plainText = document()->toPlainText(); + if (!d->tentativeCommit.isEmpty()) + plainText.insert(textCursor().position(), d->tentativeCommit); + return plainText; +} +#ifndef QT_NO_TEXTHTMLPARSER +QString QWidgetTextControl::toHtml() const +{ + // note: currently not including tentative commit + return document()->toHtml(); +} +#endif void QWidgetTextControlPrivate::append(const QString &text, Qt::TextFormat format) { |