thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "KEYMAPPER: Make global keymap that is always active"

Browse source 
This reverts commit ac85d134b3.
This commit is contained in:
Tarek Soliman 2011-11-02 10:16:16 -05:00
parent 6523454db5
commit b708d6de79
4 changed files with 3 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

20
backends/keymapper/remap-dialog.cpp
View file

@ -357,26 +357,6 @@ void RemapDialog::loadKeymap() {
}
}
// get the mapping out of the global keymap
if (_keymapper->getGlobalKeymap()) {
List<const HardwareKey*>::iterator keyIt = freeKeys.begin();
Keymap *globalKeymap = _keymapper->getGlobalKeymap();
while (keyIt != freeKeys.end()) {
Action *act = globalKeymap->getMappedAction((*keyIt)->key);
if (act) {
ActionInfo info = {act, true, act->description + " (" + globalKeymap->getName() + ")"};
_currentActions.push_back(info);
freeKeys.erase(keyIt++);
} else {
++keyIt;
}
if (freeKeys.empty())
break;
}
}
} else if (_kmPopUp->getSelected() != -1) {
Keymap *km = _keymapTable[_kmPopUp->getSelectedTag()];