libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-13 21:31:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix crash in Options dialog in 320xY mode. Shadow was drawn off-screen

Browse Source 
svn-id: r21438
This commit is contained in:
Eugene Sandulenko 2006-03-24 18:10:41 +00:00
parent f433bdb566
commit 7569f796ec
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gui/newgui.cpp
View File

@ -70,14 +70,14 @@ GuiObject::GuiObject(Common::String name) : _firstWidget(0) {
error("Widget <%s> has x < 0", name.c_str());
if(_x >= g_system->getOverlayWidth())
error("Widget <%s> has x > %d", name.c_str(), g_system->getOverlayWidth());
if(_x + _w >= g_system->getOverlayWidth())
error("Widget <%s> has x + w > %d", name.c_str(), g_system->getOverlayWidth());
if(_x + _w > g_system->getOverlayWidth())
error("Widget <%s> has x + w > %d (%d)", name.c_str(), g_system->getOverlayWidth(), _x + _w);
if(_y < 0)
error("Widget <%s> has y < 0", name.c_str());
if(_y >= g_system->getOverlayWidth())
error("Widget <%s> has y > %d", name.c_str(), g_system->getOverlayHeight());
if(_y + _h >= g_system->getOverlayWidth())
error("Widget <%s> has y + h > %d", name.c_str(), g_system->getOverlayHeight());
if(_y + _h > g_system->getOverlayWidth())
error("Widget <%s> has y + h > %d (%d)", name.c_str(), g_system->getOverlayHeight(), _y + _h);
_name = name;
}

8
gui/theme-config.cpp
View File

@ -35,8 +35,8 @@ const char *Theme::_defaultConfigINI =
"def_kLineHeight=12\n"
"def_kFontHeight=10\n"
"def_globOptionsW=(w - 2 * 10)\n"
"def_globOptionsH=(h - 1 * 40)\n"
"def_gameOptionsH=(h - 2 * 30)\n"
"def_globOptionsH=(h - 30)\n"
"def_gameOptionsH=(h - 30)\n"
"def_gameOptionsLabelWidth=60\n"
"def_tabPopupsLabelW=100\n"
"def_aboutXOff=3\n"
@ -116,7 +116,7 @@ const char *Theme::_defaultConfigINI =
"launcher_list=hBorder (kLineHeight + 16) (w - 2 * hBorder) (top - kLineHeight - 20)\n"
"\n"
"### global options\n"
"globaloptions=10 40 globOptionsW globOptionsH\n"
"globaloptions=10 20 globOptionsW globOptionsH\n"
"set_parent=globaloptions\n"
"vBorder=5\n"
"globaloptions_tabwidget=0 vBorder parent.w (parent.h - buttonHeight - 8 - 2 * vBorder)\n"
@ -149,7 +149,7 @@ const char *Theme::_defaultConfigINI =
"globaloptions_ok=(prev.x2 + 10) prev.y prev.w prev.h\n"
"\n"
"### game options\n"
"gameoptions=10 40 (w - 2 * 10) gameOptionsH\n"
"gameoptions=10 20 (w - 2 * 10) gameOptionsH\n"
"set_parent=gameoptions\n"
"vBorder=5\n"
"gox=5\n"