X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flabel.cpp;h=c59e71851d3ceaee9b91ce71203087b79220e35d;hb=707b59d45ae50b69c94918f8f74313283b304597;hp=9676fa37ab148bfaccb23d1ccc65b38f363d48d7;hpb=e7bc29984e91ee36555d6a4e4eece22170d10ba4;p=libs%2Fgltk.git

diff --git a/source/label.cpp b/source/label.cpp
index 9676fa3..c59e718 100644
--- a/source/label.cpp
+++ b/source/label.cpp
@@ -1,39 +1,52 @@
 #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::set_text(const string &t)
+{
+	text = t;
+	signal_autosize_changed.emit();
+	rebuild();
+}
+
+void Label::autosize_special(const Part &part, Geometry &ageom) const
 {
-	text=t;
+	if(part.get_name()=="text")
+		text.autosize(part, ageom);
 }
 
-void Label::render_part(const Part &part) const
+void Label::rebuild_special(const Part &part)
 {
 	if(part.get_name()=="text")
-		render_text(part, text);
-	else
-		Widget::render_part(part);
+		text.build(part, state, geom, part_cache);
+}
+
+void Label::on_style_change()
+{
+	text.set_style(style);
 }
 
 
 Label::Loader::Loader(Label &l):
-	Widget::Loader(l)
+	DataFile::DerivedObjectLoader<Label, 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);
+	obj.text = t;
 }
 
 } // namespace GLtk