mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-04-04 21:17:43 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix use of modifiers under macOS

Browse source 
* Fix #6463
This commit is contained in:
Jonathan White 2022-06-04 10:07:26 -04:00
parent dab7047113
commit 0f3a2531e7
3 changed files with 27 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/gui/osutils/macutils/MacUtils.cpp
View file

@ -185,7 +185,6 @@ void MacUtils::registerNativeEventFilter()
bool MacUtils::registerGlobalShortcut(const QString& name, Qt::Key key, Qt::KeyboardModifiers modifiers, QString* error)
{
auto keycode = qtToNativeKeyCode(key);
auto modifierscode = qtToNativeModifiers(modifiers, false);
if (keycode == INVALID_KEYCODE) {
if (error) {
*error = tr("Invalid key code");
@ -193,6 +192,16 @@ bool MacUtils::registerGlobalShortcut(const QString& name, Qt::Key key, Qt::Keyb
return false;
}
// Qt inverts CMD and CTRL on macOS under the hood, undo this
if (modifiers & Qt::MetaModifier && !(modifiers & Qt::ControlModifier)) {
modifiers &= ~Qt::MetaModifier;
modifiers |= Qt::ControlModifier;
} else if (modifiers & Qt::ControlModifier && !(modifiers & Qt::MetaModifier)) {
modifiers &= ~Qt::ControlModifier;
modifiers |= Qt::MetaModifier;
}
auto modifierscode = qtToNativeModifiers(modifiers, false);
// Check if this key combo is registered to another shortcut
QHashIterator<QString, QSharedPointer<globalShortcut>> i(m_globalShortcuts);
while (i.hasNext()) {
@ -440,7 +449,6 @@ uint16 MacUtils::qtToNativeKeyCode(Qt::Key key)
return kVK_F16;
default:
Q_ASSERT(false);
return INVALID_KEYCODE;
}
}
@ -469,13 +477,13 @@ CGEventFlags MacUtils::qtToNativeModifiers(Qt::KeyboardModifiers modifiers, bool
nativeModifiers = CGEventFlags(nativeModifiers | shiftMod);
}
if (modifiers & Qt::ControlModifier) {
nativeModifiers = CGEventFlags(nativeModifiers | cmdMod);
nativeModifiers = CGEventFlags(nativeModifiers | controlMod);
}
if (modifiers & Qt::AltModifier) {
nativeModifiers = CGEventFlags(nativeModifiers | optionMod);
}
if (modifiers & Qt::MetaModifier) {
nativeModifiers = CGEventFlags(nativeModifiers | controlMod);
nativeModifiers = CGEventFlags(nativeModifiers | cmdMod);
}
return nativeModifiers;