diff options
| author | Vicent Marti | 2008-08-08 18:30:16 +0000 |
|---|---|---|
| committer | Vicent Marti | 2008-08-08 18:30:16 +0000 |
| commit | dab1fa0942cffa82c1944170774b659b8bcfb6b2 (patch) | |
| tree | 443690e96619facaa839d57c45e7f094d8d356fd /gui/console.cpp | |
| parent | 3ca6f76f7be2ef8c982c83ed0c1a1da633033c35 (diff) | |
| download | scummvm-rg350-dab1fa0942cffa82c1944170774b659b8bcfb6b2.tar.gz scummvm-rg350-dab1fa0942cffa82c1944170774b659b8bcfb6b2.tar.bz2 scummvm-rg350-dab1fa0942cffa82c1944170774b659b8bcfb6b2.zip | |
Resolution-dependence in XML files.
G1X scaler GUI now loads. Added layout for the launcher menu.
MILESTONE: All core GUI dialogs/widgets working on G2x/G3x
MILESTONE: Completely removed old Evaluator/Parser.
Improved layout expanding again.
Improved XML parser.
Several bugfixes.
svn-id: r33704
Diffstat (limited to 'gui/console.cpp')
| -rw-r--r-- | gui/console.cpp | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/gui/console.cpp b/gui/console.cpp index 728724d76f..de4db14a4f 100644 --- a/gui/console.cpp +++ b/gui/console.cpp @@ -25,6 +25,7 @@ #include "gui/console.h" #include "gui/ScrollBarWidget.h" #include "gui/eval.h" +#include "gui/ThemeEval.h" #include "engines/engine.h" #include "base/version.h" @@ -97,17 +98,14 @@ ConsoleDialog::ConsoleDialog(float widthPercent, float heightPercent) void ConsoleDialog::init() { const int screenW = g_system->getOverlayWidth(); const int screenH = g_system->getOverlayHeight(); - int f = g_gui.evaluator()->getVar("Console.font"); - if (f == EVAL_UNDEF_VAR) - _font = FontMan.getFontByUsage(Graphics::FontManager::kConsoleFont); - else - _font = g_gui.theme()->getFont((Theme::FontStyle)f); + _font = FontMan.getFontByUsage((Graphics::FontManager::FontUsage) + g_gui.xmlEval()->getVar("Console.Font", Graphics::FontManager::kConsoleFont)); - _leftPadding = g_gui.evaluator()->getVar("Console.leftPadding", 0); - _rightPadding = g_gui.evaluator()->getVar("Console.rightPadding", 0); - _topPadding = g_gui.evaluator()->getVar("Console.topPadding", 0); - _bottomPadding = g_gui.evaluator()->getVar("Console.bottomPadding", 0); + _leftPadding = g_gui.xmlEval()->getVar("Globals.Console.Padding.Left", 0); + _rightPadding = g_gui.xmlEval()->getVar("Globals.Console.Padding.Right", 0); + _topPadding = g_gui.xmlEval()->getVar("Globals.Console.Padding.Top", 0); + _bottomPadding = g_gui.xmlEval()->getVar("Globals.Console.Padding.Bottom", 0); // Calculate the real width/height (rounded to char/line multiples) _w = (uint16)(_widthPercent * screenW); |