diff options
| author | Lars Persson | 2009-02-12 22:05:07 +0000 |
|---|---|---|
| committer | Lars Persson | 2009-02-12 22:05:07 +0000 |
| commit | adbc453163ef1408da4592913e8eda7f71ee1907 (patch) | |
| tree | 8855f93c42315d97254ad1db710b8e5f6b749b55 /engines | |
| parent | 3c163dbb4e2f79906fa7a64be706a512a94eb7fe (diff) | |
| download | scummvm-rg350-adbc453163ef1408da4592913e8eda7f71ee1907.tar.gz scummvm-rg350-adbc453163ef1408da4592913e8eda7f71ee1907.tar.bz2 scummvm-rg350-adbc453163ef1408da4592913e8eda7f71ee1907.zip | |
Fixed working Keys button in in game options dialog
Fixed key mappings dialog layout
svn-id: r36285
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/dialogs.cpp | 14 | ||||
| -rw-r--r-- | engines/scumm/dialogs.cpp | 14 |
2 files changed, 13 insertions, 15 deletions
diff --git a/engines/dialogs.cpp b/engines/dialogs.cpp index 410b5e8d4d..4f9557306e 100644 --- a/engines/dialogs.cpp +++ b/engines/dialogs.cpp @@ -296,12 +296,6 @@ ConfigDialog::ConfigDialog(bool subtitleControls) #ifdef SMALL_SCREEN_DEVICE new GUI::ButtonWidget(this, "ScummConfig.Keys", "Keys", kKeysCmd, 'K'); - - // - // Create the sub dialog(s) - // - - _keysDialog = new GUI::KeysDialog(); #endif } @@ -316,7 +310,13 @@ void ConfigDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data) case kKeysCmd: #ifdef SMALL_SCREEN_DEVICE - _keysDialog->runModal(); + // + // Create the sub dialog(s) + // + _keysDialog = new GUI::KeysDialog(); + _keysDialog->runModal(); + delete _keysDialog; + _keysDialog = NULL; #endif break; default: diff --git a/engines/scumm/dialogs.cpp b/engines/scumm/dialogs.cpp index fc21b10b8d..b193683337 100644 --- a/engines/scumm/dialogs.cpp +++ b/engines/scumm/dialogs.cpp @@ -591,14 +591,6 @@ ConfigDialog::ConfigDialog() #ifdef SMALL_SCREEN_DEVICE new GUI::ButtonWidget(this, "ScummConfig.Keys", "Keys", kKeysCmd, 'K'); #endif - -#ifdef SMALL_SCREEN_DEVICE - // - // Create the sub dialog(s) - // - - _keysDialog = new GUI::KeysDialog(); -#endif } ConfigDialog::~ConfigDialog() { @@ -611,7 +603,13 @@ void ConfigDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data) switch (cmd) { case kKeysCmd: #ifdef SMALL_SCREEN_DEVICE + // + // Create the sub dialog(s) + // + _keysDialog = new GUI::KeysDialog(); _keysDialog->runModal(); + delete _keysDialog; + _keysDialog = NULL; #endif break; default: |