dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use QKeyCombination with Qt 6

Browse Source
This commit is contained in:
Jonas Kvinge
2020-09-04 23:00:42 +02:00
parent 900a4071ed
commit 091b1b8209
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/globalshortcuts/globalshortcut.cpp
View File

@@ -26,6 +26,10 @@
#include <QHash> #include <QHash>
#include <QFlags> #include <QFlags>
#include <QtDebug> #include <QtDebug>
#include <QKeySequence>
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
# include <QKeyCombination>
#endif
#include "core/logging.h" #include "core/logging.h"
@@ -79,9 +83,15 @@ bool GlobalShortcut::setShortcut(const QKeySequence &shortcut) {
if (shortcut.isEmpty()) return false; if (shortcut.isEmpty()) return false;
shortcut_ = shortcut; shortcut_ = shortcut;
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
QKeyCombination key_combination(shortcut[0]);
qt_key_ = key_combination.key();
qt_mods_ = key_combination.keyboardModifiers();
#else
Qt::KeyboardModifiers all_mods = Qt::ShiftModifier | Qt::ControlModifier | Qt::AltModifier | Qt::MetaModifier; Qt::KeyboardModifiers all_mods = Qt::ShiftModifier | Qt::ControlModifier | Qt::AltModifier | Qt::MetaModifier;
qt_key_ = Qt::Key((shortcut[0] ^ all_mods) & shortcut[0]); qt_key_ = Qt::Key((shortcut[0] ^ all_mods) & shortcut[0]);
qt_mods_ = Qt::KeyboardModifiers(shortcut[0] & all_mods); qt_mods_ = Qt::KeyboardModifiers(shortcut[0] & all_mods);
#endif
native_key_ = nativeKeycode(qt_key_); native_key_ = nativeKeycode(qt_key_);
if (native_key_ == 0) return false; if (native_key_ == 0) return false;