diff options
| author | Eugene Sandulenko | 2016-07-10 16:23:34 +0200 |
|---|---|---|
| committer | GitHub | 2016-07-10 16:23:34 +0200 |
| commit | 9cec2eea5cdaf2893771f434c45648dcf7da88f2 (patch) | |
| tree | 1882aab09f95ca00c9772a882e618aef2d6260cb /gui/object.cpp | |
| parent | 862f12c71b94346a8653d2eba5b6fc0a0d59a782 (diff) | |
| parent | 846619fd42ecb11e94958e39bd61ea29a9ff76cd (diff) | |
| download | scummvm-rg350-9cec2eea5cdaf2893771f434c45648dcf7da88f2.tar.gz scummvm-rg350-9cec2eea5cdaf2893771f434c45648dcf7da88f2.tar.bz2 scummvm-rg350-9cec2eea5cdaf2893771f434c45648dcf7da88f2.zip | |
Merge pull request #774 from Tkachov/the-container-box-pr2
GUI: Add ScrollContainerWidget
Diffstat (limited to 'gui/object.cpp')
| -rw-r--r-- | gui/object.cpp | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/gui/object.cpp b/gui/object.cpp index ef2cc9d6e0..de66d95492 100644 --- a/gui/object.cpp +++ b/gui/object.cpp @@ -44,19 +44,6 @@ void GuiObject::reflowLayout() { if (!g_gui.xmlEval()->getWidgetData(_name, _x, _y, _w, _h)) { error("Could not load widget position for '%s'", _name.c_str()); } - - if (_x < 0) - error("Widget <%s> has x < 0 (%d)", _name.c_str(), _x); - if (_x >= g_gui.getWidth()) - error("Widget <%s> has x > %d (%d)", _name.c_str(), g_gui.getWidth(), _x); - if (_x + _w > g_gui.getWidth()) - error("Widget <%s> has x + w > %d (%d)", _name.c_str(), g_gui.getWidth(), _x + _w); - if (_y < 0) - error("Widget <%s> has y < 0 (%d)", _name.c_str(), _y); - if (_y >= g_gui.getHeight()) - error("Widget <%s> has y > %d (%d)", _name.c_str(), g_gui.getHeight(), _y); - if (_y + _h > g_gui.getHeight()) - error("Widget <%s> has y + h > %d (%d)", _name.c_str(), g_gui.getHeight(), _y + _h); } } |
