diff options
| author | Stephen Kennedy | 2008-08-18 19:54:46 +0000 |
|---|---|---|
| committer | Stephen Kennedy | 2008-08-18 19:54:46 +0000 |
| commit | 34518951897d5b90d4d345f7f7465b4f86a67ed8 (patch) | |
| tree | 309ced0bcf2107b821372a57711ed46db4a99528 /gui | |
| parent | 12d649f0113befdb7098962eabb7dd70e194a88b (diff) | |
| download | scummvm-rg350-34518951897d5b90d4d345f7f7465b4f86a67ed8.tar.gz scummvm-rg350-34518951897d5b90d4d345f7f7465b4f86a67ed8.tar.bz2 scummvm-rg350-34518951897d5b90d4d345f7f7465b4f86a67ed8.zip | |
Final changes to keymapper:
* HardwareKey's now have a type too, so that we can either match a key to an action or vice versa.
* Better test keymaps - with special gui keymap that is activated when a dialog is opened
svn-id: r34005
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/newgui.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gui/newgui.cpp b/gui/newgui.cpp index 618c7bc873..6c42d8e9b2 100644 --- a/gui/newgui.cpp +++ b/gui/newgui.cpp @@ -22,6 +22,7 @@ * $Id$ */ +#include "backends/keymapper/keymapper.h" #include "common/events.h" #include "common/system.h" #include "common/util.h" @@ -235,7 +236,7 @@ void NewGui::runLoop() { } Common::EventManager *eventMan = _system->getEventManager(); - + eventMan->getKeymapper()->pushKeymap("gui"); while (!_dialogStack.empty() && activeDialog == getTopDialog()) { if (_needRedraw) { redraw(); @@ -326,6 +327,7 @@ void NewGui::runLoop() { // Delay for a moment _system->delayMillis(10); } + eventMan->getKeymapper()->popKeymap(); // HACK: since we reopen all dialogs anyway on redraw // we for now use Theme::closeAllDialogs here, until |