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

macOS: in password lineedits, pass dead keys to the input method

Browse Source 
Otherwise the IM cannot correctly compose the input, making it impossible
to enter e.g. ü or ~ on certain keyboard layouts. Note that the native
macOS NSSecureTextField does not allow that either, which is however a
very bad user experience.

With this change, the modifier characters like ¨ diacritics will be visible
when entering them in either NoEcho or Password line edits. The follow-up
commit will remove those as well.

Fixes: QTBUG-84664
Change-Id: Ib4c5ab85634c17c407623f82b46c4849c72d9e69
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
This commit is contained in:
Volker Hilsheimer 2021-05-06 17:00:22 +02:00
parent 11ae678b9d
commit b24da5449b
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/platforms/cocoa/qnsview.mm
View File

@ -125,6 +125,7 @@ QT_NAMESPACE_ALIAS_OBJC_CLASS(QNSViewMouseMoveHelper);
Qt::MouseButtons m_frameStrutButtons; Qt::MouseButtons m_frameStrutButtons;
QString m_composingText; QString m_composingText;
QPointer<QObject> m_composingFocusObject; QPointer<QObject> m_composingFocusObject;
bool m_lastKeyDead;
bool m_sendKeyEvent; bool m_sendKeyEvent;
bool m_dontOverrideCtrlLMB; bool m_dontOverrideCtrlLMB;
bool m_sendUpAsRightButton; bool m_sendUpAsRightButton;
@ -142,6 +143,7 @@ QT_NAMESPACE_ALIAS_OBJC_CLASS(QNSViewMouseMoveHelper);
{ {
if ((self = [super initWithFrame:NSZeroRect])) { if ((self = [super initWithFrame:NSZeroRect])) {
m_platformWindow = platformWindow; m_platformWindow = platformWindow;
m_lastKeyDead = false;
m_sendKeyEvent = false; m_sendKeyEvent = false;
m_inputSource = nil; m_inputSource = nil;
m_resendKeyEvent = false; m_resendKeyEvent = false;

6
src/plugins/platforms/cocoa/qnsview_keys.mm
View File

@ -111,11 +111,15 @@
if (QCoreApplication::sendEvent(fo, &queryEvent)) { if (QCoreApplication::sendEvent(fo, &queryEvent)) {
bool imEnabled = queryEvent.value(Qt::ImEnabled).toBool(); bool imEnabled = queryEvent.value(Qt::ImEnabled).toBool();
Qt::InputMethodHints hints = static_cast<Qt::InputMethodHints>(queryEvent.value(Qt::ImHints).toUInt()); Qt::InputMethodHints hints = static_cast<Qt::InputMethodHints>(queryEvent.value(Qt::ImHints).toUInt());
if (imEnabled && !(hints & Qt::ImhDigitsOnly || hints & Qt::ImhFormattedNumbersOnly || hints & Qt::ImhHiddenText)) { // make sure we send dead keys and the next key to the input method for composition
const bool ignoreHidden = (hints & Qt::ImhHiddenText) && !text.isEmpty() && !m_lastKeyDead;
if (imEnabled && !(hints & Qt::ImhDigitsOnly || hints & Qt::ImhFormattedNumbersOnly || ignoreHidden)) {
// pass the key event to the input method. note that m_sendKeyEvent may be set to false during this call // pass the key event to the input method. note that m_sendKeyEvent may be set to false during this call
m_currentlyInterpretedKeyEvent = nsevent; m_currentlyInterpretedKeyEvent = nsevent;
[self interpretKeyEvents:@[nsevent]]; [self interpretKeyEvents:@[nsevent]];
m_currentlyInterpretedKeyEvent = 0; m_currentlyInterpretedKeyEvent = 0;
// if the last key we sent was dead, then pass the next key to the IM as well to complete composition
m_lastKeyDead = text.isEmpty();
} }
} }
} }