X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcontainer.cpp;h=f1f1934c071d724caaf17086076ccde92c111369;hb=HEAD;hp=03dff1137bfdf6416f6d755c61bae65604f8733b;hpb=5bb0cc92a28a7862571249a2512bcd23ed272344;p=libs%2Fgltk.git diff --git a/source/container.cpp b/source/container.cpp index 03dff11..f1f1934 100644 --- a/source/container.cpp +++ b/source/container.cpp @@ -1,3 +1,4 @@ +#include #include "container.h" #include "part.h" @@ -11,51 +12,51 @@ hierarchy_error::hierarchy_error(const string &w): { } -Container::Container(): - click_focus(0), - click_button(0), - pointer_focus(0), - pointer_grabbed(false), - input_focus(0), - saved_input_focus(0), - touch_focus(0) -{ } - Container::~Container() { + // Clear children here while members are still valid while(!children.empty()) - delete children.front()->widget; + { + if(children.back()->own_widget) + /* Avoid destroying the unique_ptr for the widget from within its own + reset() function */ + unique_ptr w = move(children.back()->own_widget); + else + children.pop_back(); + } } -void Container::add(Widget &wdg) +void Container::add(unique_ptr wdg) { - wdg.set_parent(this); - children.push_back(create_child(&wdg)); - if(wdg.get_animation_interval()) - check_animation_interval(); - on_child_added(wdg); + add_child(*wdg).own_widget = move(wdg); } void Container::remove(Widget &wdg) { - for(list::iterator i=children.begin(); i!=children.end(); ++i) - if((*i)->widget==&wdg) - { - wdg.set_parent(0); - delete *i; - children.erase(i); - if(wdg.get_animation_interval()) - check_animation_interval(); - on_child_removed(wdg); - return; - } + auto i = find_if(children, [&wdg](const unique_ptr &c){ return c->widget==&wdg; }); + if(i==children.end()) + throw hierarchy_error("widget not in container"); - throw hierarchy_error("widget not in container"); + unique_ptr owned = move((*i)->own_widget); + if(&wdg==saved_input_focus) + saved_input_focus = nullptr; + wdg.set_parent(nullptr); + children.erase(i); + if(wdg.get_animation_interval()) + check_animation_interval(); + on_child_removed(wdg); } -Container::Child *Container::create_child(Widget *wdg) +Container::Child &Container::add_child(Widget &wdg) { - return new Child(*this, wdg); + wdg.set_parent(this); + children.push_back(make_unique(*this, &wdg)); + if(wdg.get_animation_interval()) + check_animation_interval(); + children_rebuild_needed = true; + signal_rebuild_needed.emit(); + on_child_added(wdg); + return *children.back(); } Geometry Container::determine_child_geometry(const Widget &child, const Part &part) const @@ -88,31 +89,30 @@ void Container::reposition_child(Widget &child, const Part &part) const child.set_geometry(determine_child_geometry(child, part)); } -list Container::get_children() const +vector Container::get_children() const { - list result; - for(list::const_iterator i=children.begin(); i!=children.end(); ++i) - result.push_back((*i)->widget); + vector result; + for(const unique_ptr &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(list::const_iterator i=children.end(); i!=children.begin();) + for(auto i=children.end(); i!=children.begin();) if((*--i)->widget->is_visible() && (*i)->widget->get_geometry().is_inside(x, y)) return (*i)->widget; - return 0; + 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); - if(wdg2) + if(Widget *wdg2 = cont->find_descendant_at(x-cgeom.x, y-cgeom.y)) return wdg2; } return wdg; @@ -120,17 +120,16 @@ Widget *Container::get_descendant_at(int x, int y) const void Container::raise(Widget &wdg) { - for(list::iterator i=children.begin(); i!=children.end(); ++i) - if((*i)->widget==&wdg) - { - children.splice(children.end(), children, i); - return; - } + auto i = find_if(children, [&wdg](const unique_ptr &c){ return c->widget==&wdg; }); + if(i==children.end()) + throw hierarchy_error("widget not in container"); - throw hierarchy_error("widget not in container"); + unique_ptr c = move(*i); + children.erase(i); + children.push_back(move(c)); } -void Container::set_pointer_focus(Widget *wdg) +void Container::set_pointer_focus(Widget *wdg, bool grab) { if(wdg!=pointer_focus) { @@ -138,10 +137,13 @@ void Container::set_pointer_focus(Widget *wdg) pointer_focus->pointer_leave(); pointer_focus = wdg; + pointer_grabbed = grab; if(pointer_focus) pointer_focus->pointer_enter(); } + else + pointer_grabbed = grab; } void Container::set_input_focus(Widget *wdg) @@ -171,9 +173,9 @@ Widget *Container::get_final_input_focus() const void Container::check_animation_interval() { Time::TimeDelta shortest; - for(list::const_iterator i=children.begin(); i!=children.end(); ++i) + for(const unique_ptr &c: children) { - const Time::TimeDelta &child_iv = (*i)->widget->get_animation_interval(); + const Time::TimeDelta &child_iv = c->widget->get_animation_interval(); if(child_iv && (!shortest || child_iv &c: children) + c->widget->rebuild_hierarchy(); + } +} + void Container::button_press(int x, int y, unsigned btn) { if(Widget *child = get_pointer_target(x, y, false)) @@ -207,9 +221,9 @@ void Container::button_release(int x, int y, unsigned btn) { if(child==click_focus && btn==click_button) { - click_focus = 0; + 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(); @@ -221,7 +235,7 @@ void Container::pointer_motion(int x, int y) { Widget *child = get_pointer_target(x, y, false); if(!pointer_grabbed) - set_pointer_focus((!click_focus || child->get_geometry().is_inside(x, y)) ? child : 0); + set_pointer_focus((child && child->get_geometry().is_inside(x, y)) ? child : nullptr); if(child) { @@ -240,18 +254,18 @@ 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 - return 0; + return nullptr; } } void Container::pointer_leave() { Widget::pointer_leave(); - set_pointer_focus(0); + set_pointer_focus(nullptr); } void Container::touch_press(int x, int y, unsigned finger) @@ -273,7 +287,7 @@ void Container::touch_release(int x, int y, unsigned finger) { // TODO track focus for each finger separately if(child==touch_focus) - touch_focus = 0; + touch_focus = nullptr; const Geometry &cgeom = child->get_geometry(); child->touch_release(x-cgeom.x, y-cgeom.y, finger); @@ -315,7 +329,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(); } @@ -323,7 +337,7 @@ void Container::focus_in() void Container::focus_out() { saved_input_focus = input_focus; - set_input_focus(0); + set_input_focus(nullptr); Widget::focus_out(); } @@ -337,29 +351,29 @@ bool Container::navigate(Navigation nav) void Container::animate(const Time::TimeDelta &dt) { - for(list::iterator i=children.begin(); i!=children.end(); ++i) + for(const unique_ptr &c: children) { - const Time::TimeDelta &child_iv = (*i)->widget->get_animation_interval(); + const Time::TimeDelta &child_iv = c->widget->get_animation_interval(); if(!child_iv) continue; - (*i)->time_since_animate += dt; - if((*i)->time_since_animate>=child_iv) + c->time_since_animate += dt; + if(c->time_since_animate>=child_iv) { - Time::TimeDelta child_dt = (*i)->time_since_animate; - (*i)->time_since_animate = min((*i)->time_since_animate-child_iv, child_iv); - (*i)->widget->animate(child_dt); + Time::TimeDelta child_dt = c->time_since_animate; + c->time_since_animate = min(c->time_since_animate-child_iv, child_iv); + c->widget->animate(child_dt); } } } void Container::on_reparent() { - for(list::iterator i=children.begin(); i!=children.end(); ++i) + for(const unique_ptr &c: children) { - if(Container *c = dynamic_cast((*i)->widget)) - c->on_reparent(); - (*i)->widget->update_style(); + if(Container *o = dynamic_cast(c->widget)) + o->on_reparent(); + c->widget->update_style(); } } @@ -379,6 +393,13 @@ Container::Child::Child(Container &c, Widget *w): widget->signal_grab_pointer.connect(sigc::mem_fun(this, &Child::grab_pointer)); widget->signal_ungrab_pointer.connect(sigc::mem_fun(this, &Child::ungrab_pointer)); widget->signal_request_animation.connect(sigc::mem_fun(this, &Child::request_animation)); + widget->signal_rebuild_needed.connect(sigc::mem_fun(this, &Child::rebuild_needed)); +} + +Container::Child::Child(Container &c, unique_ptr w): + Child(c, w.get()) +{ + own_widget = move(w); } Container::Child::~Child() @@ -391,11 +412,11 @@ void Container::Child::visibility_changed(bool v) if(!v) { if(widget==container.click_focus) - container.click_focus = 0; + container.click_focus = nullptr; if(widget==container.pointer_focus) - container.set_pointer_focus(0); + container.set_pointer_focus(nullptr); if(widget==container.input_focus) - container.set_input_focus(0); + container.set_input_focus(nullptr); } } @@ -411,8 +432,7 @@ void Container::Child::grab_pointer() { if(!container.pointer_grabbed) { - container.set_pointer_focus(widget); - container.pointer_grabbed = true; + container.set_pointer_focus(widget, true); container.signal_grab_pointer.emit(); } } @@ -422,8 +442,7 @@ void Container::Child::ungrab_pointer() if(container.pointer_grabbed && container.pointer_focus==widget) { // XXX Should set to the widget under pointer - container.set_pointer_focus(0); - container.pointer_grabbed = false; + container.set_pointer_focus(nullptr); container.signal_ungrab_pointer.emit(); } } @@ -435,5 +454,11 @@ void Container::Child::request_animation(const Time::TimeDelta &interval) container.check_animation_interval(); } +void Container::Child::rebuild_needed() +{ + container.children_rebuild_needed = true; + container.signal_rebuild_needed.emit(); +} + } // namespace GLtk } // namespace Msp