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/newgui.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/newgui.cpp')
| -rw-r--r-- | gui/newgui.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gui/newgui.cpp b/gui/newgui.cpp index 9a0d8cef88..c89937595b 100644 --- a/gui/newgui.cpp +++ b/gui/newgui.cpp @@ -61,6 +61,8 @@ void GuiObject::reflowLayout() { if (!g_gui.xmlEval()->getWidgetData(_name, _x, _y, _w, _h)) { warning("Could not load widget position for '%s'", _name.c_str()); } + + return; if (_x < 0) error("Widget <%s> has x < 0: %d", _name.c_str(), _x); @@ -442,7 +444,7 @@ void NewGui::animateCursor() { } WidgetSize NewGui::getWidgetSize() { - return (WidgetSize)(_theme->_evaluator->getVar("widgetSize")); + return (WidgetSize)(g_gui.xmlEval()->getVar("Globals.WidgetSize")); } void NewGui::clearDragWidget() { |