X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcontainer.cpp;h=f1f1934c071d724caaf17086076ccde92c111369;hb=HEAD;hp=393973cc2ab7293adcd32c3e939442780e0ff23e;hpb=9678abb23abe450109e2feda081f5bba5f20cc94;p=libs%2Fgltk.git

diff --git a/source/container.cpp b/source/container.cpp
index 393973c..f1f1934 100644
--- a/source/container.cpp
+++ b/source/container.cpp
@@ -14,38 +14,49 @@ hierarchy_error::hierarchy_error(const string &w):
 
 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<Widget> w = move(children.back()->own_widget);
+		else
+			children.pop_back();
+	}
 }
 
-void Container::add(Widget &wdg)
+void Container::add(unique_ptr<Widget> wdg)
 {
-	wdg.set_parent(this);
-	children.push_back(create_child(&wdg));
-	if(wdg.get_animation_interval())
-		check_animation_interval();
-	children_rebuild_needed = true;
-	signal_rebuild_needed.emit();
-	on_child_added(wdg);
+	add_child(*wdg).own_widget = move(wdg);
 }
 
 void Container::remove(Widget &wdg)
 {
-	auto i = find_if(children, [&wdg](const Child *c){ return c->widget==&wdg; });
+	auto i = find_if(children, [&wdg](const unique_ptr<Child> &c){ return c->widget==&wdg; });
 	if(i==children.end())
 		throw hierarchy_error("widget not in container");
 
+	unique_ptr<Widget> owned = move((*i)->own_widget);
+	if(&wdg==saved_input_focus)
+		saved_input_focus = nullptr;
 	wdg.set_parent(nullptr);
-	delete *i;
 	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<Child>(*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
@@ -78,10 +89,10 @@ 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;
-	for(const Child *c: children)
+	vector<Widget *> result;
+	for(const unique_ptr<Child> &c: children)
 		result.push_back(c->widget);
 	return result;
 }
@@ -101,8 +112,7 @@ Widget *Container::find_descendant_at(int x, int y) const
 	if(Container *cont = dynamic_cast<Container *>(wdg))
 	{
 		const Geometry &cgeom = wdg->get_geometry();
-		Widget *wdg2 = cont->find_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;
@@ -110,11 +120,13 @@ Widget *Container::find_descendant_at(int x, int y) const
 
 void Container::raise(Widget &wdg)
 {
-	auto i = find_if(children, [&wdg](const Child *c){ return c->widget==&wdg; });
+	auto i = find_if(children, [&wdg](const unique_ptr<Child> &c){ return c->widget==&wdg; });
 	if(i==children.end())
 		throw hierarchy_error("widget not in container");
 
-	children.splice(children.end(), children, i);
+	unique_ptr<Child> c = move(*i);
+	children.erase(i);
+	children.push_back(move(c));
 }
 
 void Container::set_pointer_focus(Widget *wdg, bool grab)
@@ -161,7 +173,7 @@ Widget *Container::get_final_input_focus() const
 void Container::check_animation_interval()
 {
 	Time::TimeDelta shortest;
-	for(const Child *c: children)
+	for(const unique_ptr<Child> &c: children)
 	{
 		const Time::TimeDelta &child_iv = c->widget->get_animation_interval();
 		if(child_iv && (!shortest || child_iv<shortest))
@@ -179,7 +191,7 @@ void Container::rebuild_hierarchy()
 	if(children_rebuild_needed)
 	{
 		children_rebuild_needed = false;
-		for(Child *c: children)
+		for(const unique_ptr<Child> &c: children)
 			c->widget->rebuild_hierarchy();
 	}
 }
@@ -317,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();
 }
@@ -339,7 +351,7 @@ bool Container::navigate(Navigation nav)
 
 void Container::animate(const Time::TimeDelta &dt)
 {
-	for(Child *c: children)
+	for(const unique_ptr<Child> &c: children)
 	{
 		const Time::TimeDelta &child_iv = c->widget->get_animation_interval();
 		if(!child_iv)
@@ -357,7 +369,7 @@ void Container::animate(const Time::TimeDelta &dt)
 
 void Container::on_reparent()
 {
-	for(const Child *c: children)
+	for(const unique_ptr<Child> &c: children)
 	{
 		if(Container *o = dynamic_cast<Container *>(c->widget))
 			o->on_reparent();
@@ -384,6 +396,12 @@ Container::Child::Child(Container &c, Widget *w):
 	widget->signal_rebuild_needed.connect(sigc::mem_fun(this, &Child::rebuild_needed));
 }
 
+Container::Child::Child(Container &c, unique_ptr<Widget> w):
+	Child(c, w.get())
+{
+	own_widget = move(w);
+}
+
 Container::Child::~Child()
 {
 	visibility_changed(false);