X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flabel.cpp;h=3805eaf587c21a31217229ca2bdb464985c10e1b;hb=c8f5fd14a1fbdaaa9e1216dd5163d1f5c1b5ff27;hp=18bef1a066bb529274644a78cddfd92ec64a1c10;hpb=a87d05583cb7dffaf0e0f5eb9f9b2fc0bcf656e1;p=libs%2Fgltk.git

diff --git a/source/label.cpp b/source/label.cpp
index 18bef1a..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,36 +7,31 @@ using namespace std;
 namespace Msp {
 namespace GLtk {
 
-Label::Label(const Resources &r, const string &t):
-	Widget(r),
-	text(style)
+Label::Label(const string &t)
 {
-	focusable=false;
-	update_style();
+	focusable = false;
 	set_text(t);
 }
 
 void Label::autosize()
 {
-	const list<Part> &parts=style->get_parts();
-	const Part *text_part=0;
-	for(list<Part>::const_iterator i=parts.begin(); (!text_part && i!=parts.end()); ++i)
-		if(i->get_name()=="text")
-			text_part=&*i;
+	if(!style)
+		return;
+
+	Widget::autosize();
 
-	geom.h=text.get_height();
-	geom.w=text.get_width();
-	if(text_part)
+	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;
+		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);
 	}
 }
 
 void Label::set_text(const string &t)
 {
-	text=t;
+	text = t;
+	signal_autosize_changed.emit();
 }
 
 void Label::render_special(const Part &part) const
@@ -54,7 +42,7 @@ void Label::render_special(const Part &part) const
 
 void Label::on_style_change()
 {
-	text.update_style();
+	text.set_style(style);
 }
 
 
@@ -66,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