diff options
| author | Vicent Marti | 2008-08-08 21:52:16 +0000 |
|---|---|---|
| committer | Vicent Marti | 2008-08-08 21:52:16 +0000 |
| commit | 01b8373d95c216ce8cbe29abcc98837d35046e37 (patch) | |
| tree | 748a2c94ffc098349c60444f72d473182c3f72d0 /gui | |
| parent | f546aa9dc8d3bc811a4a356271022c29d121711d (diff) | |
| download | scummvm-rg350-01b8373d95c216ce8cbe29abcc98837d35046e37.tar.gz scummvm-rg350-01b8373d95c216ce8cbe29abcc98837d35046e37.tar.bz2 scummvm-rg350-01b8373d95c216ce8cbe29abcc98837d35046e37.zip | |
Fixed: About dialog in all resolutions.
svn-id: r33707
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/about.cpp | 15 | ||||
| -rw-r--r-- | gui/themes/default.inc | 2 | ||||
| -rw-r--r-- | gui/themes/modern.stx | 3 |
3 files changed, 13 insertions, 7 deletions
diff --git a/gui/about.cpp b/gui/about.cpp index 71bf877d21..eeb2533e0d 100644 --- a/gui/about.cpp +++ b/gui/about.cpp @@ -29,10 +29,11 @@ #include "common/system.h" #include "common/util.h" #include "gui/about.h" -#include "gui/eval.h" #include "gui/newgui.h" #include "gui/widget.h" +#include "gui/ThemeEval.h" + namespace GUI { enum { @@ -85,9 +86,9 @@ AboutDialog::AboutDialog() const int screenW = g_system->getOverlayWidth(); const int screenH = g_system->getOverlayHeight(); - _xOff = g_gui.evaluator()->getVar("aboutXOff"); - _yOff = g_gui.evaluator()->getVar("aboutYOff"); - int outerBorder = g_gui.evaluator()->getVar("aboutOuterBorder"); + _xOff = g_gui.xmlEval()->getVar("Globals.About.XOffset", 5); + _yOff = g_gui.xmlEval()->getVar("Globals.About.YOffset", 5); + int outerBorder = g_gui.xmlEval()->getVar("Globals.About.OuterBorder"); _w = screenW - 2 * outerBorder; _h = screenH - 2 * outerBorder; @@ -316,9 +317,9 @@ void AboutDialog::reflowLayout() { const int screenW = g_system->getOverlayWidth(); const int screenH = g_system->getOverlayHeight(); - _xOff = g_gui.evaluator()->getVar("aboutXOff"); - _yOff = g_gui.evaluator()->getVar("aboutYOff"); - int outerBorder = g_gui.evaluator()->getVar("aboutOuterBorder"); + _xOff = g_gui.xmlEval()->getVar("Globals.About.XOffset", 5); + _yOff = g_gui.xmlEval()->getVar("Globals.About.YOffset", 5); + int outerBorder = g_gui.xmlEval()->getVar("Globals.About.OuterBorder"); _w = screenW - 2 * outerBorder; _h = screenH - 2 * outerBorder; diff --git a/gui/themes/default.inc b/gui/themes/default.inc index 97b7d6a260..961917b05e 100644 --- a/gui/themes/default.inc +++ b/gui/themes/default.inc @@ -404,6 +404,8 @@ "<def var = 'Padding.Left' value = '16' /> " "<def var = 'Padding.Right' value = '16' /> " "<def var = 'Padding.Top' value = '16' /> " +"<def var = 'About.OuterBorder' value = '80'/> " +"<def resolution = '320xY' var = 'About.OuterBorder' value = '16'/> " "<def var = 'ListWidget.hlLeftPadding' value = '0'/> " "<def var = 'ListWidget.hlRightPadding' value = '16'/> " "<def var = 'PopUpWidget.labelSpacing' value = '10' /> " diff --git a/gui/themes/modern.stx b/gui/themes/modern.stx index cf022960bb..33f557b366 100644 --- a/gui/themes/modern.stx +++ b/gui/themes/modern.stx @@ -467,6 +467,9 @@ <def var = 'Padding.Right' value = '16' /> <def var = 'Padding.Top' value = '16' /> + <def var = 'About.OuterBorder' value = '80'/> + <def resolution = '320xY' var = 'About.OuterBorder' value = '16'/> + <def var = 'ListWidget.hlLeftPadding' value = '0'/> <def var = 'ListWidget.hlRightPadding' value = '16'/> <def var = 'PopUpWidget.labelSpacing' value = '10' /> |