X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flabel.cpp;h=3805eaf587c21a31217229ca2bdb464985c10e1b;hb=b8bfaf14b5c68428cf34c0e8514e03cd0614ee5b;hp=63b0ebdc2a1b24f366d9f4b28e82646455a5c4c3;hpb=787dd5572e904a87686e7309401b86e0c528d823;p=libs%2Fgltk.git

diff --git a/source/label.cpp b/source/label.cpp
index 63b0ebd..3805eaf 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"
@@ -14,30 +7,31 @@ using namespace std;
 namespace Msp {
 namespace GLtk {
 
-Label::Label(const Resources &r, const string &t):
-	Widget(r),
-	text()
+Label::Label(const string &t)
 {
 	focusable = false;
-	update_style();
 	set_text(t);
 }
 
 void Label::autosize()
 {
-	geom.h = text.get_height();
-	geom.w = text.get_width();
+	if(!style)
+		return;
+
+	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 +54,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