X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flabel.cpp;h=c59e71851d3ceaee9b91ce71203087b79220e35d;hb=707b59d45ae50b69c94918f8f74313283b304597;hp=21974be7b5844f42275181ce47c26f1794dc2299;hpb=df07e8f3e239b146cbc458d3cbd69758e590d255;p=libs%2Fgltk.git

diff --git a/source/label.cpp b/source/label.cpp
index 21974be..c59e718 100644
--- a/source/label.cpp
+++ b/source/label.cpp
@@ -13,23 +13,6 @@ Label::Label(const string &t)
 	set_text(t);
 }
 
-void Label::autosize()
-{
-	if(!style)
-		return;
-
-	Widget::autosize();
-
-	if(const Part *text_part = style->get_part("text"))
-	{
-		const Sides &margin = text_part->get_margin();
-		geom.w = max(geom.w, text.get_width()+margin.left+margin.right);
-		geom.h = max(geom.h, text.get_height()+margin.top+margin.bottom);
-	}
-
-	rebuild();
-}
-
 void Label::set_text(const string &t)
 {
 	text = t;
@@ -37,10 +20,16 @@ void Label::set_text(const string &t)
 	rebuild();
 }
 
-void Label::rebuild_special(const Part &part, CachedPart &cache)
+void Label::autosize_special(const Part &part, Geometry &ageom) const
+{
+	if(part.get_name()=="text")
+		text.autosize(part, ageom);
+}
+
+void Label::rebuild_special(const Part &part)
 {
 	if(part.get_name()=="text")
-		text.build(part, geom, cache);
+		text.build(part, state, geom, part_cache);
 }
 
 void Label::on_style_change()