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

GUI: Fix container widgets not receiving events

Browse Source
This commit is contained in:
Thierry Crozat 2018-07-23 23:34:01 +01:00
parent bb2f218fa1
commit f7a4b74130
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gui/widget.cpp
View File

@ -748,7 +748,10 @@ bool ContainerWidget::containsWidget(Widget *w) const {
}
Widget *ContainerWidget::findWidget(int x, int y) {
return findWidgetInChain(_firstWidget, x, y);
Widget *w = findWidgetInChain(_firstWidget, x, y);
if (w)
return w;
return this;
}
void ContainerWidget::removeWidget(Widget *widget) {

5
gui/widgets/scrollcontainer.cpp
View File

@ -153,7 +153,10 @@ bool ScrollContainerWidget::containsWidget(Widget *w) const {
Widget *ScrollContainerWidget::findWidget(int x, int y) {
if (_verticalScroll->isVisible() && x >= _w - _verticalScroll->getWidth())
return _verticalScroll;
return Widget::findWidgetInChain(_firstWidget, x + _scrolledX, y + _scrolledY);
Widget *w = Widget::findWidgetInChain(_firstWidget, x + _scrolledX, y + _scrolledY);
if (w)
return w;
return this;
}
Common::Rect ScrollContainerWidget::getClipRect() const {