diff options
| author | Tero Saarni <tero.saarni@digia.com> | 2009-11-18 12:04:08 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-12-10 12:47:34 (GMT) |
| commit | 2fa94ee5569c91435e68f578f29a712dcfd37e4f (patch) | |
| tree | 09cd8076952cda459f0a721a1a8fa8668f50e2fd | |
| parent | 4d9ef7c20bedd715f3d8d7c644942d688716f785 (diff) | |
| download | Qt-2fa94ee5569c91435e68f578f29a712dcfd37e4f.zip Qt-2fa94ee5569c91435e68f578f29a712dcfd37e4f.tar.gz Qt-2fa94ee5569c91435e68f578f29a712dcfd37e4f.tar.bz2 | |
Can't delete selected characters from FEP using backspace touch button.
When selection was deleted, the changes where not updated on virtual
keyboard. Added new connection to notify when text has changed.
Task-number: QTBUG-4847
Reviewed-by: Markku Luukkainen
Merge-request: 2149
Signed-off-by: axis <qt-info@nokia.com>
| -rw-r--r-- | src/gui/widgets/qlineedit_p.cpp | 5 | ||||
| -rw-r--r-- | src/gui/widgets/qplaintextedit.cpp | 3 | ||||
| -rw-r--r-- | src/gui/widgets/qtextedit.cpp | 5 |
3 files changed, 13 insertions, 0 deletions
diff --git a/src/gui/widgets/qlineedit_p.cpp b/src/gui/widgets/qlineedit_p.cpp index 4437fef..bdf7993 100644 --- a/src/gui/widgets/qlineedit_p.cpp +++ b/src/gui/widgets/qlineedit_p.cpp @@ -149,6 +149,11 @@ void QLineEditPrivate::init(const QString& txt) #endif QObject::connect(control, SIGNAL(cursorPositionChanged(int,int)), q, SLOT(updateMicroFocus())); + +#if !defined(QT_NO_IM) && (defined(Q_WS_X11) || defined(Q_WS_QWS) || defined(Q_OS_SYMBIAN)) + QObject::connect(control, SIGNAL(textChanged(const QString &)), + q, SLOT(updateMicroFocus())); +#endif // for now, going completely overboard with updates. QObject::connect(control, SIGNAL(selectionChanged()), diff --git a/src/gui/widgets/qplaintextedit.cpp b/src/gui/widgets/qplaintextedit.cpp index 89fe7b8..31f8bb4 100644 --- a/src/gui/widgets/qplaintextedit.cpp +++ b/src/gui/widgets/qplaintextedit.cpp @@ -761,6 +761,9 @@ void QPlainTextEditPrivate::init(const QString &txt) QObject::connect(control, SIGNAL(cursorPositionChanged()), q, SLOT(_q_cursorPositionChanged())); QObject::connect(control, SIGNAL(cursorPositionChanged()), q, SIGNAL(cursorPositionChanged())); +#if !defined(QT_NO_IM) && (defined(Q_WS_X11) || defined(Q_WS_QWS) || defined(Q_OS_SYMBIAN)) + QObject::connect(control, SIGNAL(textChanged(const QString &)), q, SLOT(updateMicroFocus())); +#endif // set a null page size initially to avoid any relayouting until the textedit // is shown. relayoutDocument() will take care of setting the page size to the diff --git a/src/gui/widgets/qtextedit.cpp b/src/gui/widgets/qtextedit.cpp index 1bc0bf1..f79c870 100644 --- a/src/gui/widgets/qtextedit.cpp +++ b/src/gui/widgets/qtextedit.cpp @@ -158,6 +158,11 @@ void QTextEditPrivate::init(const QString &html) QObject::connect(control, SIGNAL(selectionChanged()), q, SIGNAL(selectionChanged())); QObject::connect(control, SIGNAL(cursorPositionChanged()), q, SIGNAL(cursorPositionChanged())); +#if !defined(QT_NO_IM) && (defined(Q_WS_X11) || defined(Q_WS_QWS) || defined(Q_OS_SYMBIAN)) + QObject::connect(control, SIGNAL(textChanged(const QString &)), q, SLOT(updateMicroFocus())); +#endif + + QTextDocument *doc = control->document(); // set a null page size initially to avoid any relayouting until the textedit // is shown. relayoutDocument() will take care of setting the page size to the |