X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fwidget.cpp;h=76b6e615712c29c459d208abe8300671aae5bc6e;hb=2a665655a15f73d59083fd5cc7e5a58ae5f4d377;hp=59105b949b3e09d027b6c9a78ed34e228f764aa2;hpb=2e3bb9608ef4c74a8ba9c101ba24b68285405090;p=libs%2Fgltk.git

diff --git a/source/widget.cpp b/source/widget.cpp
index 59105b9..76b6e61 100644
--- a/source/widget.cpp
+++ b/source/widget.cpp
@@ -39,13 +39,18 @@ 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;
 
-	Geometry ageom;
-	ageom.x = geom.x;
-	ageom.y = geom.y;
+	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)
 	{
@@ -59,8 +64,6 @@ void Widget::autosize()
 		else
 			autosize_special(*i, ageom);
 	}
-
-	set_geometry(ageom);
 }
 
 void Widget::set_geometry(const Geometry &g)
@@ -179,8 +182,10 @@ void Widget::set_enabled(bool e)
 
 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()
@@ -188,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)
 	{
@@ -197,6 +202,7 @@ void Widget::rebuild()
 		else
 			rebuild_special(*i);
 	}
+	part_cache.end_rebuild();
 }
 
 void Widget::rebuild_special(const Part &part)