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

diff --git a/source/label.cpp b/source/label.cpp
index 0e0134d..ae821a8 100644
--- a/source/label.cpp
+++ b/source/label.cpp
@@ -7,18 +7,40 @@ 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 Resources &r, const string &t):
+	Widget(r),
+	text(style)
 {
-	set_text(t);
 	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;
+
+	geom.h=text.get_height();
+	geom.w=text.get_width();
+	if(text_part)
+	{
+		const Sides &margin=text_part->get_margin();
+		geom.w+=margin.left+margin.right;
+		geom.h+=margin.top+margin.bottom;
+	}
 }
 
-void Label::set_text(const std::string &t)
+void Label::set_text(const string &t)
 {
 	text=t;
 }
@@ -26,19 +48,19 @@ void Label::set_text(const std::string &t)
 void Label::render_special(const Part &part) const
 {
 	if(part.get_name()=="text")
-		render_text(part, text);
+		text.render(part, geom);
 }
 
 
 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 &>(wdg).text=t;
 }
 
 } // namespace GLtk