diff options
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/ThemeEngine.cpp | 5 | ||||
| -rw-r--r-- | gui/object.cpp | 2 | ||||
| -rw-r--r-- | gui/widgets/scrollcontainer.cpp | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/gui/ThemeEngine.cpp b/gui/ThemeEngine.cpp index 3c6f5956a8..1204f00a68 100644 --- a/gui/ThemeEngine.cpp +++ b/gui/ThemeEngine.cpp @@ -265,8 +265,9 @@ void ThemeItemDrawDataClip::drawSelf(bool draw, bool restore) { if (draw) { Common::List<Graphics::DrawStep>::const_iterator step; - for (step = _data->_steps.begin(); step != _data->_steps.end(); ++step) - _engine->renderer()->drawStep(_area, *step, _dynamicData); + for (step = _data->_steps.begin(); step != _data->_steps.end(); ++step) { + _engine->renderer()->drawStepClip(_area, _clip, *step, _dynamicData); + } } _engine->addDirtyRect(extendedRect); diff --git a/gui/object.cpp b/gui/object.cpp index ef2cc9d6e0..2d9e9597f5 100644 --- a/gui/object.cpp +++ b/gui/object.cpp @@ -45,6 +45,7 @@ void GuiObject::reflowLayout() { 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()) @@ -57,6 +58,7 @@ void GuiObject::reflowLayout() { 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); + */ } } diff --git a/gui/widgets/scrollcontainer.cpp b/gui/widgets/scrollcontainer.cpp index 8b9341f575..5e112b476f 100644 --- a/gui/widgets/scrollcontainer.cpp +++ b/gui/widgets/scrollcontainer.cpp @@ -50,7 +50,7 @@ void ScrollContainerWidget::init() { } void ScrollContainerWidget::recalc() { - _verticalScroll->_numEntries = _h; + _verticalScroll->_numEntries = _h + 40; _verticalScroll->_currentPos = _scrolledY; _verticalScroll->_entriesPerPage = _limitH; _verticalScroll->setPos(_w - 16, _scrolledY); |