Minor refactoring

[libs/gltk.git] / source / container.cpp

diff --git a/source/container.cpp b/source/container.cpp
index 4f4d2a370152fe6fda3b05c2e65de7d92d59ef35..a8c3133d0632238831c5b1692f29c2e9c32c3876 100644 (file)
--- a/source/container.cpp
+++ b/source/container.cpp
@@ -35,6 +35,8 @@ void Container::remove(Widget &wdg)
        if(i==children.end())
                throw hierarchy_error("widget not in container");
 
+       if(&wdg==saved_input_focus)
+               saved_input_focus = nullptr;
        wdg.set_parent(nullptr);
        delete *i;
        children.erase(i);
@@ -78,15 +80,15 @@ void Container::reposition_child(Widget &child, const Part &part) const
        child.set_geometry(determine_child_geometry(child, part));
 }
 
-list<Widget *> Container::get_children() const
+vector<Widget *> Container::get_children() const
 {
-       list<Widget *> result;
+       vector<Widget *> result;
        for(const Child *c: children)
                result.push_back(c->widget);
        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,14 +97,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<Container *>(wdg))
        {
                const Geometry &cgeom = wdg->get_geometry();
-               Widget *wdg2 = cont->get_descendant_at(x-cgeom.x, y-cgeom.y);
-               if(wdg2)
+               if(Widget *wdg2 = cont->find_descendant_at(x-cgeom.x, y-cgeom.y))
                        return wdg2;
        }
        return wdg;
@@ -114,7 +115,9 @@ void Container::raise(Widget &wdg)
        if(i==children.end())
                throw hierarchy_error("widget not in container");
 
-       children.splice(children.end(), children, i);
+       Child *c = *i;
+       children.erase(i);
+       children.push_back(c);
 }
 
 void Container::set_pointer_focus(Widget *wdg, bool grab)
@@ -211,7 +214,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 +245,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
@@ -317,7 +320,7 @@ bool Container::character(wchar_t ch)
 
 void Container::focus_in()
 {
-       if(saved_input_focus && saved_input_focus->get_parent()==this)
+       if(saved_input_focus)
                set_input_focus(saved_input_focus);
        Widget::focus_in();
 }