Skip to content

Fix KeyBoardMap::getKeySymbol() keyModifier logic #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mk401 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix KeyBoardMap::getKeySymbol() keyModifier logic #56

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions src/vsgQt/KeyboardMap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,9 +188,18 @@ bool KeyboardMap::getKeySymbol(const QKeyEvent* e, vsg::KeySymbol& keySymbol, vs
modifierMask |= vsg::KeyModifier::MODKEY_Meta;
}

// On key releases, mod keys are not present in QKeyEvent::modifiers(), so need to manually add them to the modifierMask
const int key = e->key();
if (key == Qt::Key_Control)
modifierMask |= vsg::KeyModifier::MODKEY_Control;
else if (key == Qt::Key_Shift)
modifierMask |= vsg::KeyModifier::MODKEY_Shift;
else if (key == Qt::Key_Alt)
modifierMask |= vsg::KeyModifier::MODKEY_Alt;

keyModifier = (vsg::KeyModifier)modifierMask;

auto itr = _keycodeMap.find((uint32_t)e->key());
auto itr = _keycodeMap.find((uint32_t)key);
if (itr != _keycodeMap.end())
{
keySymbol = itr->second;
Expand All @@ -200,7 +209,7 @@ bool KeyboardMap::getKeySymbol(const QKeyEvent* e, vsg::KeySymbol& keySymbol, vs
}
else
{
keySymbol = vsg::KeySymbol(e->key());
keySymbol = vsg::KeySymbol(key);
if (keySymbol >= 'A' && keySymbol <= 'Z') keySymbol = vsg::KeySymbol(int(keySymbol) + int('a' - 'A'));

modifiedKeySymbol = vsg::KeySymbol(*(e->text().toLatin1().data()));
Expand Down