X-Git-Url: http://git.tdb.fi/?p=libs%2Fgltk.git;a=blobdiff_plain;f=source%2Fcontainer.cpp;fp=source%2Fcontainer.cpp;h=393973cc2ab7293adcd32c3e939442780e0ff23e;hp=4f4d2a370152fe6fda3b05c2e65de7d92d59ef35;hb=9678abb23abe450109e2feda081f5bba5f20cc94;hpb=d10d1de6d17c285c63d7b3cea549017aaa1ddb01 diff --git a/source/container.cpp b/source/container.cpp index 4f4d2a3..393973c 100644 --- a/source/container.cpp +++ b/source/container.cpp @@ -86,7 +86,7 @@ list Container::get_children() const return result; } -Widget *Container::get_child_at(int x, int y) const +Widget *Container::find_child_at(int x, int y) const { for(auto i=children.end(); i!=children.begin();) if((*--i)->widget->is_visible() && (*i)->widget->get_geometry().is_inside(x, y)) @@ -95,13 +95,13 @@ Widget *Container::get_child_at(int x, int y) const return nullptr; } -Widget *Container::get_descendant_at(int x, int y) const +Widget *Container::find_descendant_at(int x, int y) const { - Widget *wdg = get_child_at(x, y); + Widget *wdg = find_child_at(x, y); if(Container *cont = dynamic_cast(wdg)) { const Geometry &cgeom = wdg->get_geometry(); - Widget *wdg2 = cont->get_descendant_at(x-cgeom.x, y-cgeom.y); + Widget *wdg2 = cont->find_descendant_at(x-cgeom.x, y-cgeom.y); if(wdg2) return wdg2; } @@ -211,7 +211,7 @@ void Container::button_release(int x, int y, unsigned btn) { click_focus = nullptr; if(!pointer_focus) - set_pointer_focus(get_child_at(x, y)); + set_pointer_focus(find_child_at(x, y)); } const Geometry &cgeom = child->get_geometry(); @@ -242,7 +242,7 @@ Widget *Container::get_pointer_target(int x, int y, bool touch) const return touch_focus; else { - Widget *child = get_child_at(x, y); + Widget *child = find_child_at(x, y); if(child && child->is_enabled()) return child; else