diff options
| author | Stephen Kennedy | 2008-07-11 20:10:14 +0000 |
|---|---|---|
| committer | Stephen Kennedy | 2008-07-11 20:10:14 +0000 |
| commit | 8aa09cbb991d5122d8327ddfa41f67ee2c9a938d (patch) | |
| tree | 3e79a61cb2263c69c6c7f156ca4c6238bfae6fae /backends/events | |
| parent | 48ed272c8d56c322c291dc3e20a53f48e8c33190 (diff) | |
| download | scummvm-rg350-8aa09cbb991d5122d8327ddfa41f67ee2c9a938d.tar.gz scummvm-rg350-8aa09cbb991d5122d8327ddfa41f67ee2c9a938d.tar.bz2 scummvm-rg350-8aa09cbb991d5122d8327ddfa41f67ee2c9a938d.zip | |
Better handling of virtual keyboard and gui being displayed at the same time. VK now also uses its own cursor.
svn-id: r33008
Diffstat (limited to 'backends/events')
| -rw-r--r-- | backends/events/default/default-events.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/backends/events/default/default-events.cpp b/backends/events/default/default-events.cpp index d06edaec1b..6113f0e65c 100644 --- a/backends/events/default/default-events.cpp +++ b/backends/events/default/default-events.cpp @@ -31,7 +31,6 @@ #include "engines/engine.h" #include "gui/message.h" -#include "gui/newgui.h" #define RECORD_SIGNATURE 0x54455354 #define RECORD_VERSION 1 @@ -397,8 +396,7 @@ bool DefaultEventManager::pollEvent(Common::Event &event) { if (event.kbd.keycode == Common::KEYCODE_F6 && event.kbd.flags == 0) { if (_vk->isDisplaying()) { _vk->hide(); - } else if (!g_gui.isActive()) { - if (!_vk->isLoaded()) _vk->loadKeyboardPack("test"); + } else { bool isPaused = (g_engine) ? g_engine->isPaused() : true; if (!isPaused) g_engine->pauseEngine(true); _vk->show(); |