1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Always update the input method when QLineEdit receives focus

Browse Source 
The line edit receiving focus might require different input method
capabilities (e.g. be a password edit), so the input method needs to
be refreshed when focus is received. This implicitly happens on tab
focus when the text is selected or the cursor is moved within an
input mask, but neither of those might happen, and for click-focus
it never happened.

Fixes: QTBUG-86846
Done-with: Volker Hilsheimer <volker.hilsheimer@qt.io>
Change-Id: I47c5275d3a9d4d190ebce64269a345431346c17c
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit d5e8efd8cb02876dc314da0579d33af39ba38495)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Tang Haixiang 2020-09-23 13:50:59 +08:00 committed by Qt Cherry-pick Bot
parent 2cfdbd62be
commit 12ef53e0d3
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/widgets/widgets/qlineedit.cpp
View File

@ -1892,8 +1892,11 @@ void QLineEdit::focusInEvent(QFocusEvent *e)
d->control->moveCursor(d->control->nextMaskBlank(0)); d->control->moveCursor(d->control->nextMaskBlank(0));
else if (!d->control->hasSelectedText()) else if (!d->control->hasSelectedText())
selectAll(); selectAll();
else
updateMicroFocus();
} else if (e->reason() == Qt::MouseFocusReason) { } else if (e->reason() == Qt::MouseFocusReason) {
d->clickCausedFocus = 1; d->clickCausedFocus = 1;
updateMicroFocus();
} }
#ifdef QT_KEYPAD_NAVIGATION #ifdef QT_KEYPAD_NAVIGATION
if (!QApplicationPrivate::keypadNavigationEnabled() || (hasEditFocus() && ( e->reason() == Qt::PopupFocusReason))) { if (!QApplicationPrivate::keypadNavigationEnabled() || (hasEditFocus() && ( e->reason() == Qt::PopupFocusReason))) {