Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2024-09-17 08:02:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Qt: Fix modifier key bindings not having any effect

Browse source
This commit is contained in:
Connor McLaughlin 2020-08-15 20:48:47 +10:00
parent e0e76b881d
commit ae3ad04bfc
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/duckstation-qt/qtutils.cpp
View file

@ -525,8 +525,6 @@ static const std::array<QtKeyModifierEntry, 5> s_qt_key_modifiers = {
{Qt::AltModifier, Qt::Key_Alt, QStringLiteral("Alt")}, {Qt::AltModifier, Qt::Key_Alt, QStringLiteral("Alt")},
{Qt::MetaModifier, Qt::Key_Meta, QStringLiteral("Meta")}, {Qt::MetaModifier, Qt::Key_Meta, QStringLiteral("Meta")},
{Qt::KeypadModifier, static_cast<Qt::Key>(0), QStringLiteral("Keypad")}}}; {Qt::KeypadModifier, static_cast<Qt::Key>(0), QStringLiteral("Keypad")}}};
static const Qt::KeyboardModifiers s_qt_modifier_mask =
Qt::ShiftModifier | Qt::ControlModifier | Qt::AltModifier | Qt::MetaModifier | Qt::KeypadModifier;
QString GetKeyIdentifier(int key) QString GetKeyIdentifier(int key)
{ {
@ -597,7 +595,20 @@ std::optional<int> ParseKeyString(const QString& key_str)
int KeyEventToInt(const QKeyEvent* ke) int KeyEventToInt(const QKeyEvent* ke)
{ {
return static_cast<int>(ke->modifiers() & s_qt_modifier_mask) | ke->key(); const Qt::KeyboardModifiers mods = ke->modifiers();
const int key = ke->key();
int val = key;
if (mods != 0)
{
for (const QtKeyModifierEntry& mod : s_qt_key_modifiers)
{
if (mods & mod.mod && key != mod.key)
val |= static_cast<int>(mod.mod);
}
}
return val;
} }
QByteArray ReadStreamToQByteArray(ByteStream* stream, bool rewind /*= false*/) QByteArray ReadStreamToQByteArray(ByteStream* stream, bool rewind /*= false*/)