atria-soft/ewol
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] correct assert

Browse Source
This commit is contained in:
Edouard DUPIN 2014-05-28 21:56:22 +02:00
parent d88028a7dc
commit 7ee8ff29bd
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
sources/ewol/widget/Layer.cpp
View File

@ -34,19 +34,20 @@ ewol::object::Shared<ewol::Widget> ewol::widget::Layer::getWidgetAtPos(const vec
return nullptr; return nullptr;
} }
// for all element in the sizer ... // for all element in the sizer ...
for (auto it : m_subWidget) { for (auto &it : m_subWidget) {
if (it != nullptr) { if (it == nullptr) {
vec2 tmpSize = it->getSize(); continue;
vec2 tmpOrigin = it->getOrigin(); }
if( (tmpOrigin.x() <= _pos.x() && tmpOrigin.x() + tmpSize.x() >= _pos.x()) vec2 tmpSize = it->getSize();
&& (tmpOrigin.y() <= _pos.y() && tmpOrigin.y() + tmpSize.y() >= _pos.y()) ) vec2 tmpOrigin = it->getOrigin();
{ if( (tmpOrigin.x() <= _pos.x() && tmpOrigin.x() + tmpSize.x() >= _pos.x())
ewol::object::Shared<ewol::Widget> tmpWidget = it->getWidgetAtPos(_pos); && (tmpOrigin.y() <= _pos.y() && tmpOrigin.y() + tmpSize.y() >= _pos.y()) )
if (nullptr != tmpWidget) { {
return tmpWidget; ewol::object::Shared<ewol::Widget> tmpWidget = it->getWidgetAtPos(_pos);
} if (nullptr != tmpWidget) {
// parse the next layer ... return tmpWidget;
} }
// parse the next layer ...
} }
} }
return nullptr; return nullptr;