ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Qt: Shortcut loading fixes

This commit is contained in:
Vicki Pfau 2017-04-11 13:06:50 -07:00
parent 34ec93670a
commit c95d0b7b07
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/platform/qt/InputModel.cpp
View File

@ -166,7 +166,13 @@ void InputModel::addKey(QMenu* menu, mPlatform platform, int key, int shortcut,
if (!item) { if (!item) {
return; return;
} }
m_keys[qMakePair(platform, key)] = item; bool loadedShortcut = false;
if (m_config) {
loadedShortcut = loadShortcuts(item);
}
if (!loadedShortcut && !m_keys.contains(qMakePair(platform, shortcut))) {
m_keys[qMakePair(platform, shortcut)] = item;
}
} }
QModelIndex InputModel::addMenu(QMenu* menu, QMenu* parentMenu) { QModelIndex InputModel::addMenu(QMenu* menu, QMenu* parentMenu) {
@ -254,11 +260,20 @@ void InputModel::updateKey(const QModelIndex& index, int keySequence) {
void InputModel::updateKey(InputItem* item, int keySequence) { void InputModel::updateKey(InputItem* item, int keySequence) {
int oldShortcut = item->shortcut(); int oldShortcut = item->shortcut();
if (item->functions().first || item->key() >= 0) { if (item->functions().first) {
if (oldShortcut > 0) { if (oldShortcut > 0) {
m_heldKeys.take(oldShortcut); m_heldKeys.take(oldShortcut);
} }
if (keySequence >= 0) { if (keySequence > 0) {
m_heldKeys[keySequence] = item;
}
}
if (item->key() >= 0) {
if (oldShortcut > 0) {
m_keys.take(qMakePair(item->platform(), oldShortcut));
}
if (keySequence > 0) {
m_keys[qMakePair(item->platform(), keySequence)] = item; m_keys[qMakePair(item->platform(), keySequence)] = item;
} }
} }