diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-07-24 11:48:44 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-07-24 12:33:46 +0200 |
| commit | 8361c6252fecf8b95cf06560f852b1e9b5c6b82b (patch) | |
| tree | c1d4b2cef3a48d10f9b53322ffa161402e150846 /src/plugins/platforms/cocoa/qcocoakeymapper.mm | |
| parent | 865582bd7fd9b7e22c46db01245fc700e5e2bbd7 (diff) | |
macOS: Clarify that QCocoaKeyMapper only computes 8 modifier states
Change-Id: Ie4a53bbc16cde7b4aa68172015bbfeaa9e316bcc
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoakeymapper.mm')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoakeymapper.mm | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoakeymapper.mm b/src/plugins/platforms/cocoa/qcocoakeymapper.mm index bcc5a9ef0c..d1654e84bb 100644 --- a/src/plugins/platforms/cocoa/qcocoakeymapper.mm +++ b/src/plugins/platforms/cocoa/qcocoakeymapper.mm @@ -444,6 +444,8 @@ static constexpr Qt::KeyboardModifiers modifierCombinations[] = { */ const QCocoaKeyMapper::KeyMap &QCocoaKeyMapper::keyMapForKey(VirtualKeyCode virtualKey, QChar unicodeKey) const { + static_assert(sizeof(modifierCombinations) / sizeof(Qt::KeyboardModifiers) == kNumModifierCombinations); + const_cast<QCocoaKeyMapper *>(this)->updateKeyboard(); auto &keyMap = m_keyMap[virtualKey]; @@ -452,7 +454,7 @@ const QCocoaKeyMapper::KeyMap &QCocoaKeyMapper::keyMapForKey(VirtualKeyCode virt qCDebug(lcQpaKeyMapper, "Updating key map for virtual key = 0x%02x!", (uint)virtualKey); - for (int i = 0; i < 16; ++i) { + for (int i = 0; i < kNumModifierCombinations; ++i) { Q_ASSERT(!i || keyMap[i] == 0); auto qtModifiers = modifierCombinations[i]; @@ -514,6 +516,7 @@ QList<int> QCocoaKeyMapper::possibleKeys(const QKeyEvent *event) const // is always valid, and the first priority. ret << int(unmodifiedKey + eventModifiers); + // FIXME: We only compute the first 8 combinations. Why? for (int i = 1; i < 8; ++i) { auto keyAfterApplyingModifiers = keyMap[i]; if (keyAfterApplyingModifiers == unmodifiedKey) |