From 81453854ee693aa31bbbd733043c114653265feb Mon Sep 17 00:00:00 2001 From: Torbjörn Andersson Date: Thu, 19 May 2005 17:03:31 +0000 Subject: Big version of the popup widget. It could use a bit more polish, though... svn-id: r18185 --- gui/options.cpp | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) (limited to 'gui/options.cpp') diff --git a/gui/options.cpp b/gui/options.cpp index de5897f9ad..f1f8088d83 100644 --- a/gui/options.cpp +++ b/gui/options.cpp @@ -313,9 +313,17 @@ int OptionsDialog::addGraphicControls(GuiObject *boss, int yoffset, WidgetSize w const int w = _w - 2 * 10; const OSystem::GraphicsMode *gm = g_system->getSupportedGraphicsModes(); + int labelWidth; + + if (ws == kBigWidgetSize) { + labelWidth = 150; + } else { + labelWidth = 100; + } + // The GFX mode popup - _gfxPopUp = new PopUpWidget(boss, x-5, yoffset, w+5, kLineHeight, "Graphics mode: ", 100); - yoffset += 16; + _gfxPopUp = addPopUp(boss, x-5, yoffset, w+5, "Graphics mode: ", labelWidth, ws); + yoffset += _gfxPopUp->getHeight() + 4; _gfxPopUp->appendEntry(""); _gfxPopUp->appendEntry(""); @@ -325,8 +333,8 @@ int OptionsDialog::addGraphicControls(GuiObject *boss, int yoffset, WidgetSize w } // RenderMode popup - _renderModePopUp = new PopUpWidget(boss, x-5, yoffset, w+5, kLineHeight, "Render mode: ", 100); - yoffset += 16; + _renderModePopUp = addPopUp(boss, x-5, yoffset, w+5, "Render mode: ", labelWidth, ws); + yoffset += _renderModePopUp->getHeight() + 4; _renderModePopUp->appendEntry("", Common::kRenderDefault); _renderModePopUp->appendEntry(""); const Common::RenderModeDescription *rm = Common::g_renderModes; @@ -357,9 +365,17 @@ int OptionsDialog::addAudioControls(GuiObject *boss, int yoffset, WidgetSize ws) const int x = 10; const int w = _w - 20; + int labelWidth; + + if (ws == kBigWidgetSize) { + labelWidth = 150; + } else { + labelWidth = 100; + } + // The MIDI mode popup & a label - _midiPopUp = new PopUpWidget(boss, x-5, yoffset, w+5, kLineHeight, "Music driver: ", 100); - yoffset += 18; + _midiPopUp = addPopUp(boss, x-5, yoffset, w+5, "Music driver: ", labelWidth, ws); + yoffset += _midiPopUp->getHeight() + 4; // Populate it const MidiDriverDescription *md = MidiDriver::getAvailableMidiDrivers(); -- cgit v1.2.3