X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flabel.cpp;h=263b2a4229d23c7c80747e37f3a66f880f2f5140;hb=HEAD;hp=f9274b47e2f665ff85ad13d6cf488be49bcec321;hpb=1aa6cd9b865e366737dcc9d2d36c4f8faed5bc4f;p=libs%2Fgltk.git

diff --git a/source/label.cpp b/source/label.cpp
index f9274b4..033bfd9 100644
--- a/source/label.cpp
+++ b/source/label.cpp
@@ -9,38 +9,26 @@ namespace GLtk {
 
 Label::Label(const string &t)
 {
-	focusable = false;
 	set_text(t);
 }
 
-void Label::autosize()
-{
-	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);
-	}
-
-	rebuild();
-}
-
 void Label::set_text(const string &t)
 {
 	text = t;
 	signal_autosize_changed.emit();
-	rebuild();
+	mark_rebuild();
+}
+
+void Label::autosize_special(const Part &part, Geometry &ageom) const
+{
+	if(part.get_name()=="text")
+		text.autosize(part, ageom);
 }
 
-void Label::rebuild_special(const Part &part, CachedPart &cache)
+void Label::rebuild_special(const Part &part)
 {
 	if(part.get_name()=="text")
-		text.build(part, geom, cache);
+		text.build(part, state, geom, part_cache);
 }
 
 void Label::on_style_change()
@@ -50,14 +38,14 @@ void Label::on_style_change()
 
 
 Label::Loader::Loader(Label &l):
-	Widget::Loader(l)
+	DataFile::DerivedObjectLoader<Label, Widget::Loader>(l)
 {
 	add("text", &Loader::text);
 }
 
 void Label::Loader::text(const string &t)
 {
-	static_cast<Label &>(obj).text = t;
+	obj.text = t;
 }
 
 } // namespace GLtk