diff options
| author | Max Horn | 2005-05-16 00:38:30 +0000 |
|---|---|---|
| committer | Max Horn | 2005-05-16 00:38:30 +0000 |
| commit | 29354345045fb0bcccc1def76629402ca652a281 (patch) | |
| tree | d9e5ba3456409b4141f5114b90cc3cacac54a734 | |
| parent | c9290b68ff62293e23e627ee3c3ac55e6a034e9a (diff) | |
| download | scummvm-rg350-29354345045fb0bcccc1def76629402ca652a281.tar.gz scummvm-rg350-29354345045fb0bcccc1def76629402ca652a281.tar.bz2 scummvm-rg350-29354345045fb0bcccc1def76629402ca652a281.zip | |
Enlarge the option dialogs; note that the widgets should be rearranged / enlarged, too; they aren't yet
svn-id: r18123
| -rw-r--r-- | gui/launcher.cpp | 6 | ||||
| -rw-r--r-- | gui/options.cpp | 6 | ||||
| -rw-r--r-- | scumm/dialogs.cpp | 15 |
3 files changed, 23 insertions, 4 deletions
diff --git a/gui/launcher.cpp b/gui/launcher.cpp index 839cf84654..e7460b1842 100644 --- a/gui/launcher.cpp +++ b/gui/launcher.cpp @@ -137,6 +137,12 @@ protected: EditGameDialog::EditGameDialog(const String &domain, GameSettings target) : OptionsDialog(domain, 10, 40, 320 - 2 * 10, 140) { + const int screenW = g_system->getOverlayWidth(); + const int screenH = g_system->getOverlayHeight(); + + _w = screenW - 2 * 10; + _h = screenH - 2 * 40; // TODO/FIXME + const int x = 5; const int w = _w - 15; const int labelWidth = 65; diff --git a/gui/options.cpp b/gui/options.cpp index ec2f65e713..b9516b32ff 100644 --- a/gui/options.cpp +++ b/gui/options.cpp @@ -435,6 +435,12 @@ int OptionsDialog::addVolumeControls(GuiObject *boss, int yoffset) { GlobalOptionsDialog::GlobalOptionsDialog() : OptionsDialog(Common::ConfigManager::kApplicationDomain, 10, 20, 320 - 2 * 10, 200 - 1 * 20) { + const int screenW = g_system->getOverlayWidth(); + const int screenH = g_system->getOverlayHeight(); + + _w = screenW - 2 * 10; + _h = screenH - 1 * 20; + const int vBorder = 4; int yoffset; diff --git a/scumm/dialogs.cpp b/scumm/dialogs.cpp index 68e67456ce..4daf9fe991 100644 --- a/scumm/dialogs.cpp +++ b/scumm/dialogs.cpp @@ -543,13 +543,20 @@ enum { kKeysCmd = 'KEYS' }; -#ifndef _WIN32_WCE ConfigDialog::ConfigDialog(ScummEngine *scumm) : GUI::OptionsDialog("", 40, 30, 240, 124), _vm(scumm) { -#else -ConfigDialog::ConfigDialog(ScummEngine *scumm) - : GUI::OptionsDialog("", 40, 30, 240, 124 + 4), _vm(scumm) { + + const int screenW = g_system->getOverlayWidth(); + const int screenH = g_system->getOverlayHeight(); + + _w = screenW - 2 * 40; + _h = screenH - 2 * 30 - 16; + +#ifdef _WIN32_WCE + _h += 4; #endif + + // // Add the buttons // |