X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcontainer.cpp;h=d02cc606394298c612bd7c94142298f88ffaf708;hb=18a5af8e80903eb9738cefe03825595877fbf447;hp=a806ccd3ce6cd3cecb9cb02f0b8eb9d8051f81dd;hpb=2e3bb9608ef4c74a8ba9c101ba24b68285405090;p=libs%2Fgltk.git

diff --git a/source/container.cpp b/source/container.cpp
index a806ccd..d02cc60 100644
--- a/source/container.cpp
+++ b/source/container.cpp
@@ -1,4 +1,5 @@
 #include "container.h"
+#include "part.h"
 
 using namespace std;
 
@@ -15,7 +16,8 @@ Container::Container():
 	click_button(0),
 	pointer_focus(0),
 	pointer_grabbed(false),
-	input_focus(0)
+	input_focus(0),
+	touch_focus(0)
 { }
 
 Container::~Container()
@@ -51,6 +53,36 @@ Container::Child *Container::create_child(Widget *wdg)
 	return new Child(*this, wdg);
 }
 
+Geometry Container::determine_child_geometry(const Widget &child, const Part &part) const
+{
+	Geometry pgeom = part.get_geometry();
+	if(!pgeom.w || !pgeom.h)
+	{
+		Geometry cgeom;
+		child.autosize(cgeom);
+		if(!pgeom.w)
+			pgeom.w = cgeom.w;
+		if(!pgeom.h)
+			pgeom.h = cgeom.h;
+	}
+
+	part.get_alignment().apply(pgeom, geom, part.get_margin());
+	return pgeom;
+}
+
+void Container::autosize_child(const Widget &child, const Part &part, Geometry &ageom) const
+{
+	Geometry cgeom = determine_child_geometry(child, part);
+	const Sides &margin = part.get_margin();
+	ageom.w = max(ageom.w, cgeom.w+margin.left+margin.right);
+	ageom.h = max(ageom.h, cgeom.h+margin.top+margin.bottom);
+}
+
+void Container::reposition_child(Widget &child, const Part &part) const
+{
+	child.set_geometry(determine_child_geometry(child, part));
+}
+
 list<Widget *> Container::get_children() const
 {
 	list<Widget *> result;
@@ -59,16 +91,16 @@ list<Widget *> Container::get_children() const
 	return result;
 }
 
-Widget *Container::get_child_at(int x, int y)
+Widget *Container::get_child_at(int x, int y) const
 {
-	for(list<Child *>::iterator i=children.end(); i!=children.begin();)
+	for(list<Child *>::const_iterator i=children.end(); i!=children.begin();)
 		if((*--i)->widget->is_visible() && (*i)->widget->get_geometry().is_inside(x, y))
 			return (*i)->widget;
 
 	return 0;
 }
 
-Widget *Container::get_descendant_at(int x, int y)
+Widget *Container::get_descendant_at(int x, int y) const
 {
 	Widget *wdg = get_child_at(x, y);
 	if(Container *cont = dynamic_cast<Container *>(wdg))
@@ -135,7 +167,7 @@ Widget *Container::get_final_input_focus() const
 
 void Container::button_press(int x, int y, unsigned btn)
 {
-	if(Widget *child = get_pointer_target(x, y))
+	if(Widget *child = get_pointer_target(x, y, false))
 	{
 		if(!click_focus)
 		{
@@ -154,7 +186,7 @@ void Container::button_press(int x, int y, unsigned btn)
 
 void Container::button_release(int x, int y, unsigned btn)
 {
-	if(Widget *child = get_pointer_target(x, y))
+	if(Widget *child = get_pointer_target(x, y, false))
 	{
 		if(child==click_focus && btn==click_button)
 		{
@@ -170,7 +202,7 @@ void Container::button_release(int x, int y, unsigned btn)
 
 void Container::pointer_motion(int x, int y)
 {
-	Widget *child = get_pointer_target(x, 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);
 
@@ -181,12 +213,14 @@ void Container::pointer_motion(int x, int y)
 	}
 }
 
-Widget *Container::get_pointer_target(int x, int y)
+Widget *Container::get_pointer_target(int x, int y, bool touch) const
 {
 	if(pointer_grabbed)
 		return pointer_focus;
-	else if(click_focus)
+	else if(!touch && click_focus)
 		return click_focus;
+	else if(touch && touch_focus)
+		return touch_focus;
 	else
 	{
 		Widget *child = get_child_at(x, y);
@@ -203,6 +237,41 @@ void Container::pointer_leave()
 	set_pointer_focus(0);
 }
 
+void Container::touch_press(int x, int y, unsigned finger)
+{
+	if(Widget *child = get_pointer_target(x, y, true))
+	{
+		// TODO track focus for each finger separately
+		if(!touch_focus)
+			touch_focus = child;
+
+		const Geometry &cgeom = child->get_geometry();
+		child->touch_press(x-cgeom.x, y-cgeom.y, finger);
+	}
+}
+
+void Container::touch_release(int x, int y, unsigned finger)
+{
+	if(Widget *child = get_pointer_target(x, y, true))
+	{
+		// TODO track focus for each finger separately
+		if(child==touch_focus)
+			touch_focus = 0;
+
+		const Geometry &cgeom = child->get_geometry();
+		child->touch_release(x-cgeom.x, y-cgeom.y, finger);
+	}
+}
+
+void Container::touch_motion(int x, int y, unsigned finger)
+{
+	if(Widget *child = get_pointer_target(x, y, true))
+	{
+		const Geometry &cgeom = child->get_geometry();
+		child->touch_motion(x-cgeom.x, y-cgeom.y, finger);
+	}
+}
+
 void Container::key_press(unsigned key, unsigned mod)
 {
 	if(input_focus)