X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcontainer.cpp;h=28e0e2feafff2105017c61bb35dda55656cf6d0e;hb=b391f4b774d17c53dfd9062fc7c7a6b14f72f926;hp=e99d9939aefdf0b951feba1572804d95e38bd5cf;hpb=ecc3ffc4433f14534560bbe51441e7f02e42a0c1;p=libs%2Fgltk.git diff --git a/source/container.cpp b/source/container.cpp index e99d993..28e0e2f 100644 --- a/source/container.cpp +++ b/source/container.cpp @@ -18,7 +18,8 @@ Container::Container(): pointer_grabbed(false), input_focus(0), saved_input_focus(0), - touch_focus(0) + touch_focus(0), + children_rebuild_needed(false) { } Container::~Container() @@ -33,6 +34,7 @@ void Container::add(Widget &wdg) children.push_back(create_child(&wdg)); if(wdg.get_animation_interval()) check_animation_interval(); + children_rebuild_needed = true; on_child_added(wdg); } @@ -185,6 +187,18 @@ void Container::check_animation_interval() set_animation_interval(shortest); } +void Container::rebuild_hierarchy() +{ + Widget::rebuild_hierarchy(); + + if(children_rebuild_needed) + { + children_rebuild_needed = false; + for(list::iterator i=children.begin(); i!=children.end(); ++i) + (*i)->widget->rebuild_hierarchy(); + } +} + void Container::button_press(int x, int y, unsigned btn) { if(Widget *child = get_pointer_target(x, y, false)) @@ -382,6 +396,7 @@ 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() @@ -436,5 +451,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