X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flabel.cpp;h=e1015e8dc1f10fdb075d5295e783ccf8bfd19d69;hb=b92c878a286036af106e969a29b2689876aa5f65;hp=6db6aa37820b593fa693cce70de22b65da469b2f;hpb=91997dd3189b93a67179822ec2fed5f2a7bddb74;p=libs%2Fgltk.git

diff --git a/source/label.cpp b/source/label.cpp
index 6db6aa3..e1015e8 100644
--- a/source/label.cpp
+++ b/source/label.cpp
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of libmspgltk
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
+Copyright © 2007, 2009-2011  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
@@ -25,19 +25,20 @@ 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);
 	}
 }
 
 void Label::set_text(const string &t)
 {
 	text = t;
+	signal_autosize_changed.emit();
 }
 
 void Label::render_special(const Part &part) const
@@ -60,7 +61,7 @@ Label::Loader::Loader(Label &l):
 
 void Label::Loader::text(const string &t)
 {
-	static_cast<Label &>(wdg).text = t;
+	static_cast<Label &>(obj).text = t;
 }
 
 } // namespace GLtk