X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flabel.cpp;h=f9274b47e2f665ff85ad13d6cf488be49bcec321;hb=815194201203afd6fa59e650e1007a355c829544;hp=e3a46234519757df692a81d23ce4fb96f940af58;hpb=73afd124ab87e8bace98db55517a56c797a9b8c7;p=libs%2Fgltk.git

diff --git a/source/label.cpp b/source/label.cpp
index e3a4623..f9274b4 100644
--- a/source/label.cpp
+++ b/source/label.cpp
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of libmspgltk
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include "label.h"
 #include "part.h"
 #include "style.h"
@@ -25,25 +18,29 @@ void Label::autosize()
 	if(!style)
 		return;
 
-	geom.h = text.get_height();
-	geom.w = text.get_width();
+	Widget::autosize();
+
 	if(const Part *text_part = style->get_part("text"))
 	{
 		const Sides &margin = text_part->get_margin();
-		geom.w += margin.left+margin.right;
-		geom.h += margin.top+margin.bottom;
+		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;
+	signal_autosize_changed.emit();
+	rebuild();
 }
 
-void Label::render_special(const Part &part) const
+void Label::rebuild_special(const Part &part, CachedPart &cache)
 {
 	if(part.get_name()=="text")
-		text.render(part, geom);
+		text.build(part, geom, cache);
 }
 
 void Label::on_style_change()