X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flabel.cpp;h=f9274b47e2f665ff85ad13d6cf488be49bcec321;hb=43a75e4e9be56c58be5e224f19016bb14b56a7ef;hp=60c3f431f9e35ca05016fc25366574d93a48474b;hpb=0af3c2393bd00f39db3bfaf5b78a7a44f0fd5ff1;p=libs%2Fgltk.git

diff --git a/source/label.cpp b/source/label.cpp
index 60c3f43..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"
@@ -14,42 +7,40 @@ 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()
 {
-	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;
 
-	geom.h = text.get_height();
-	geom.w = text.get_width();
-	if(text_part)
+	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()
@@ -66,7 +57,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