Improve widget part caching

[libs/gltk.git] / source / label.cpp

diff --git a/source/label.cpp b/source/label.cpp
index 3805eaf587c21a31217229ca2bdb464985c10e1b..f42646709a3f90e43786742790df4f9e19eb2775 100644 (file)
--- a/source/label.cpp
+++ b/source/label.cpp
@@ -26,18 +26,21 @@ void Label::autosize()
                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)
 {
        if(part.get_name()=="text")
-               text.render(part, geom);
+               text.build(part, geom, part_cache);
 }
 
 void Label::on_style_change()
@@ -47,14 +50,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