aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--engines/dialogs.cpp14
-rw-r--r--engines/scumm/dialogs.cpp14
-rw-r--r--gui/themes/default.inc10
-rw-r--r--gui/themes/scummclassic.zipbin45563 -> 47445 bytes
-rw-r--r--gui/themes/scummclassic/classic_layout.stx4
-rw-r--r--gui/themes/scummclassic/classic_layout_lowres.stx6
-rw-r--r--gui/themes/scummmodern.zipbin148565 -> 150670 bytes
-rw-r--r--gui/themes/scummmodern/scummmodern_layout.stx4
-rw-r--r--gui/themes/scummmodern/scummmodern_layout_lowres.stx6
9 files changed, 34 insertions, 24 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:
diff --git a/gui/themes/default.inc b/gui/themes/default.inc
index 71652ccaa0..a9a6608a02 100644
--- a/gui/themes/default.inc
+++ b/gui/themes/default.inc
@@ -637,7 +637,6 @@
"height='Globals.Line.Height' "
"/> "
"<widget name='List'/> "
-"<space size='Globals.Line.Height'/> "
"<widget name='Mapping' "
"height='Globals.Line.Height' "
"/> "
@@ -884,6 +883,9 @@
"</layout> "
"<space size='60'/> "
"<layout type='horizontal' padding='0,0,0,0' spacing='8'> "
+"<widget name='Keys' "
+"type='Button' "
+"/> "
"<space size='Globals.Button.Width' /> "
"<widget name='Cancel' "
"type='Button' "
@@ -1275,7 +1277,6 @@
"height='Globals.Line.Height' "
"/> "
"<widget name='List'/> "
-"<space size='Globals.Line.Height'/> "
"<widget name='Mapping' "
"height='Globals.Line.Height' "
"/> "
@@ -1531,7 +1532,10 @@
"/> "
"</layout> "
"<space size='20'/> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='8'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='4'> "
+"<widget name='Keys' "
+"type='Button' "
+"/> "
"<space size='Globals.Button.Width' /> "
"<widget name='Cancel' "
"type='Button' "
diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip
index 15b242cd46..05f1b0ab1f 100644
--- a/gui/themes/scummclassic.zip
+++ b/gui/themes/scummclassic.zip
Binary files differ
diff --git a/gui/themes/scummclassic/classic_layout.stx b/gui/themes/scummclassic/classic_layout.stx
index 015d989db1..545e93451e 100644
--- a/gui/themes/scummclassic/classic_layout.stx
+++ b/gui/themes/scummclassic/classic_layout.stx
@@ -353,7 +353,6 @@
height='Globals.Line.Height'
/>
<widget name='List'/>
- <space size='Globals.Line.Height'/>
<widget name='Mapping'
height='Globals.Line.Height'
/>
@@ -610,6 +609,9 @@
</layout>
<space size = '60'/>
<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
+ <widget name = 'Keys'
+ type = 'Button'
+ />
<space size = 'Globals.Button.Width' />
<widget name = 'Cancel'
type = 'Button'
diff --git a/gui/themes/scummclassic/classic_layout_lowres.stx b/gui/themes/scummclassic/classic_layout_lowres.stx
index b1fd9e3f43..be5374ed95 100644
--- a/gui/themes/scummclassic/classic_layout_lowres.stx
+++ b/gui/themes/scummclassic/classic_layout_lowres.stx
@@ -350,7 +350,6 @@
height='Globals.Line.Height'
/>
<widget name='List'/>
- <space size='Globals.Line.Height'/>
<widget name='Mapping'
height='Globals.Line.Height'
/>
@@ -616,7 +615,10 @@
/>
</layout>
<space size = '20'/>
- <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
+ <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '4'>
+ <widget name = 'Keys'
+ type = 'Button'
+ />
<space size = 'Globals.Button.Width' />
<widget name = 'Cancel'
type = 'Button'
diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip
index 2b15d62693..c076ff3905 100644
--- a/gui/themes/scummmodern.zip
+++ b/gui/themes/scummmodern.zip
Binary files differ
diff --git a/gui/themes/scummmodern/scummmodern_layout.stx b/gui/themes/scummmodern/scummmodern_layout.stx
index ee027526e4..ab62d92af9 100644
--- a/gui/themes/scummmodern/scummmodern_layout.stx
+++ b/gui/themes/scummmodern/scummmodern_layout.stx
@@ -364,7 +364,6 @@
height='Globals.Line.Height'
/>
<widget name='List'/>
- <space size='Globals.Line.Height'/>
<widget name='Mapping'
height='Globals.Line.Height'
/>
@@ -621,6 +620,9 @@
</layout>
<space size = '60'/>
<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
+ <widget name='Keys'
+ type='Button'
+ />
<space size = 'Globals.Button.Width' />
<widget name = 'Cancel'
type = 'Button'
diff --git a/gui/themes/scummmodern/scummmodern_layout_lowres.stx b/gui/themes/scummmodern/scummmodern_layout_lowres.stx
index bfa2fab798..11a10e2a86 100644
--- a/gui/themes/scummmodern/scummmodern_layout_lowres.stx
+++ b/gui/themes/scummmodern/scummmodern_layout_lowres.stx
@@ -348,7 +348,6 @@
height='Globals.Line.Height'
/>
<widget name='List'/>
- <space size='Globals.Line.Height'/>
<widget name='Mapping'
height='Globals.Line.Height'
/>
@@ -607,7 +606,10 @@
/>
</layout>
<space size = '20'/>
- <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
+ <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '4'>
+ <widget name = 'Keys'
+ type = 'Button'
+ />
<space size = 'Globals.Button.Width' />
<widget name = 'Cancel'
type = 'Button'
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 22:23:07 +0000