X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcontainer.cpp;h=64e3a9a7e296ce374819abddc035112a18948e53;hb=762a689d799075c0a10e1633bf95d53de80b4572;hp=d5fa6d59e3d0882fc593611c640af316d6124947;hpb=b4a3d651f57c46507aaa99a71a14fea15f0e430d;p=libs%2Fgltk.git

diff --git a/source/container.cpp b/source/container.cpp
index d5fa6d5..64e3a9a 100644
--- a/source/container.cpp
+++ b/source/container.cpp
@@ -12,17 +12,6 @@ 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),
-	children_rebuild_needed(false)
-{ }
-
 Container::~Container()
 {
 	while(!children.empty())
@@ -46,7 +35,9 @@ void Container::remove(Widget &wdg)
 	if(i==children.end())
 		throw hierarchy_error("widget not in container");
 
-	wdg.set_parent(0);
+	if(&wdg==saved_input_focus)
+		saved_input_focus = nullptr;
+	wdg.set_parent(nullptr);
 	delete *i;
 	children.erase(i);
 	if(wdg.get_animation_interval())
@@ -89,30 +80,30 @@ 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))
 			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<Container *>(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;
 	}
@@ -125,7 +116,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)
@@ -220,9 +213,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();
@@ -234,7 +227,7 @@ void Container::pointer_motion(int x, int y)
 {
 	Widget *child = get_pointer_target(x, y, false);
 	if(!pointer_grabbed)
-		set_pointer_focus((child && child->get_geometry().is_inside(x, y)) ? child : 0);
+		set_pointer_focus((child && child->get_geometry().is_inside(x, y)) ? child : nullptr);
 
 	if(child)
 	{
@@ -253,18 +246,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)
@@ -286,7 +279,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);
@@ -328,7 +321,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();
 }
@@ -336,7 +329,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();
 }
 
@@ -405,11 +398,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);
 	}
 }
 
@@ -435,7 +428,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.set_pointer_focus(nullptr);
 		container.signal_ungrab_pointer.emit();
 	}
 }