X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fwidget.cpp;h=38f8e92a67d4db6b97bef640e539b5c367ebbc73;hb=79af58bcfa941e0f2c33b172c9e924522ebcdfea;hp=f642004e07c3825fc1a79432f7a3acc237c1dadc;hpb=319cde3c06181ba1c3619567525002926d8b4889;p=libs%2Fgltk.git

diff --git a/source/widget.cpp b/source/widget.cpp
index f642004..38f8e92 100644
--- a/source/widget.cpp
+++ b/source/widget.cpp
@@ -39,28 +39,58 @@ void Widget::set_size(unsigned w, unsigned h)
 }
 
 void Widget::autosize()
+{
+	Geometry ageom;
+	autosize(ageom);
+	set_geometry(ageom);
+}
+
+void Widget::autosize(Geometry &ageom) const
 {
 	if(!style)
 		return;
 
-	geom.w = 0;
-	geom.h = 0;
+	ageom = Geometry(geom.x, geom.y, 0, 0);
 	const Style::PartSeq &parts = style->get_parts();
 	for(Style::PartSeq::const_iterator i=parts.begin(); i!=parts.end(); ++i)
+	{
 		if(i->get_name().empty())
 		{
 			const Geometry &pgeom = i->get_geometry();
 			const Sides &pmargin = i->get_margin();
-			geom.w = max(geom.w, pgeom.w+pmargin.left+pmargin.right);
-			geom.h = max(geom.h, pgeom.h+pmargin.top+pmargin.bottom);
+			ageom.w = max(ageom.w, pgeom.w+pmargin.left+pmargin.right);
+			ageom.h = max(ageom.h, pgeom.h+pmargin.top+pmargin.bottom);
 		}
+		else
+			autosize_special(*i, ageom);
+	}
 }
 
 void Widget::set_geometry(const Geometry &g)
 {
+	bool size_changed = (g.w!=geom.w || g.h!=geom.h);
 	geom = g;
-	on_geometry_change();
-	rebuild();
+	if(size_changed)
+	{
+		// TODO maybe rename this to on_size_change
+		on_geometry_change();
+		rebuild();
+	}
+}
+
+void Widget::map_coords_to_ancestor(int &x, int &y, const Widget &ancestor) const
+{
+	for(const Widget *w=this; w; w=w->get_parent())
+	{
+		if(w==&ancestor)
+			return;
+
+		const Geometry &wgeom = w->get_geometry();
+		x += wgeom.x;
+		y += wgeom.y;
+	}
+
+	throw hierarchy_error("not an ancestor");
 }
 
 void Widget::set_parent(Container *p)
@@ -145,10 +175,17 @@ void Widget::set_focus()
 	signal_request_focus.emit();
 }
 
+void Widget::set_enabled(bool e)
+{
+	set_state(DISABLED, (e ? NORMAL : DISABLED));
+}
+
 void Widget::set_state(State mask, State bits)
 {
+	State old_state = state;
 	state = (state&~mask)|bits;
-	rebuild();
+	if(style && style->compare_states(old_state, state))
+		rebuild();
 }
 
 void Widget::rebuild()
@@ -156,7 +193,7 @@ void Widget::rebuild()
 	if(!style)
 		return;
 
-	part_cache.clear();
+	part_cache.begin_rebuild();
 	const Style::PartSeq &parts = style->get_parts();
 	for(Style::PartSeq::const_iterator i=parts.begin(); i!=parts.end(); ++i)
 	{
@@ -165,6 +202,7 @@ void Widget::rebuild()
 		else
 			rebuild_special(*i);
 	}
+	part_cache.end_rebuild();
 }
 
 void Widget::rebuild_special(const Part &part)
@@ -202,6 +240,24 @@ void Widget::pointer_leave()
 	clear_state(HOVER);
 }
 
+void Widget::touch_press(int x, int y, unsigned finger)
+{
+	if(finger==0)
+		button_press(x, y, 1);
+}
+
+void Widget::touch_release(int x, int y, unsigned finger)
+{
+	if(finger==0)
+		button_release(x, y, 1);
+}
+
+void Widget::touch_motion(int x, int y, unsigned finger)
+{
+	if(finger==0)
+		pointer_motion(x, y);
+}
+
 void Widget::focus_in()
 {
 	set_state(FOCUS);