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

diff --git a/source/label.cpp b/source/label.cpp
index 0e0134d..3805eaf 100644
--- a/source/label.cpp
+++ b/source/label.cpp
@@ -1,44 +1,60 @@
-/* $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"
+
+using namespace std;
 
 namespace Msp {
 namespace GLtk {
 
-Label::Label(const Resources &r, const std::string &t):
-	Widget(r)
+Label::Label(const string &t)
 {
+	focusable = false;
 	set_text(t);
-	update_style();
 }
 
-void Label::set_text(const std::string &t)
+void Label::autosize()
 {
-	text=t;
+	if(!style)
+		return;
+
+	Widget::autosize();
+
+	if(const Part *text_part = style->get_part("text"))
+	{
+		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;
+	signal_autosize_changed.emit();
 }
 
 void Label::render_special(const Part &part) const
 {
 	if(part.get_name()=="text")
-		render_text(part, text);
+		text.render(part, geom);
+}
+
+void Label::on_style_change()
+{
+	text.set_style(style);
 }
 
 
 Label::Loader::Loader(Label &l):
 	Widget::Loader(l)
 {
-	add("text", &Label::text);
+	add("text", &Loader::text);
 }
 
-Label &Label::Loader::get_object()
+void Label::Loader::text(const string &t)
 {
-	return static_cast<Label &>(wdg);
+	static_cast<Label &>(obj).text = t;
 }
 
 } // namespace GLtk