[Scummvm-cvs-logs] SF.net SVN: scummvm: [21438] scummvm/trunk/gui
sev at users.sourceforge.net
sev at users.sourceforge.net
Fri Mar 24 10:11:05 CET 2006
Revision: 21438
Author: sev
Date: 2006-03-24 10:10:41 -0800 (Fri, 24 Mar 2006)
ViewCVS: http://svn.sourceforge.net/scummvm/?rev=21438&view=rev
Log Message:
-----------
Fix crash in Options dialog in 320xY mode. Shadow was drawn off-screen
Modified Paths:
--------------
scummvm/trunk/gui/newgui.cpp
scummvm/trunk/gui/theme-config.cpp
Modified: scummvm/trunk/gui/newgui.cpp
===================================================================
--- scummvm/trunk/gui/newgui.cpp 2006-03-24 17:42:09 UTC (rev 21437)
+++ scummvm/trunk/gui/newgui.cpp 2006-03-24 18:10:41 UTC (rev 21438)
@@ -70,14 +70,14 @@
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;
}
Modified: scummvm/trunk/gui/theme-config.cpp
===================================================================
--- scummvm/trunk/gui/theme-config.cpp 2006-03-24 17:42:09 UTC (rev 21437)
+++ scummvm/trunk/gui/theme-config.cpp 2006-03-24 18:10:41 UTC (rev 21438)
@@ -35,8 +35,8 @@
"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 @@
"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 @@
"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"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list