MrBesen
/
QxtGlobalShortcut
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

store the native mapping

This commit is contained in:
mrbesen 2021-12-14 17:53:17 +01:00
parent cf34488842
commit 336b6f5780
Signed by: MrBesen
GPG Key ID: 596B2350DCD67504
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/widgets/qxtglobalshortcut.cpp
View File

@ -77,8 +77,8 @@ bool QxtGlobalShortcutPrivate::setShortcut(const QKeySequence& shortcut)
Qt::KeyboardModifiers allMods = Qt::ShiftModifier | Qt::ControlModifier | Qt::AltModifier | Qt::MetaModifier | Qt::KeypadModifier;
key = shortcut.isEmpty() ? Qt::Key(0) : Qt::Key((shortcut[0] ^ allMods) & shortcut[0]);
mods = shortcut.isEmpty() ? Qt::KeyboardModifiers(0) : Qt::KeyboardModifiers(shortcut[0] & allMods);
const quint32 nativeKey = nativeKeycode(key, mods);
const quint32 nativeMods = nativeModifiers(mods);
nativeKey = nativeKeycode(key, mods);
nativeMods = nativeModifiers(mods);
const bool res = registerShortcut(nativeKey, nativeMods);
if (res)
shortcuts.insert(qMakePair(nativeKey, nativeMods), &qxt_p());
@ -90,8 +90,6 @@ bool QxtGlobalShortcutPrivate::setShortcut(const QKeySequence& shortcut)
bool QxtGlobalShortcutPrivate::unsetShortcut()
{
bool res = false;
const quint32 nativeKey = nativeKeycode(key, mods);
const quint32 nativeMods = nativeModifiers(mods);
if (shortcuts.value(qMakePair(nativeKey, nativeMods)) == &qxt_p())
res = unregisterShortcut(nativeKey, nativeMods);
if (res)
@ -100,6 +98,8 @@ bool QxtGlobalShortcutPrivate::unsetShortcut()
qWarning() << "QxtGlobalShortcut failed to unregister:" << QKeySequence(key + mods).toString();
key = Qt::Key(0);
mods = Qt::KeyboardModifiers(0);
nativeKey = 0;
nativeMods = 0;
return res;
}

3
src/widgets/qxtglobalshortcut_p.h
View File

@ -55,6 +55,9 @@ public:
Qt::Key key;
Qt::KeyboardModifiers mods;
quint32 nativeKey = 0;
quint32 nativeMods = 0;
bool setShortcut(const QKeySequence& shortcut);
bool unsetShortcut();