Improve widget part caching

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

diff --git a/source/label.cpp b/source/label.cpp
index 63b0ebdc2a1b24f366d9f4b28e82646455a5c4c3..f42646709a3f90e43786742790df4f9e19eb2775 100644 (file)
--- a/source/label.cpp
+++ b/source/label.cpp
@@ -1,10 +1,3 @@
-/* $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"
@@ -14,36 +7,40 @@ using namespace std;
 namespace Msp {
 namespace GLtk {
 
-Label::Label(const Resources &r, const string &t):
-       Widget(r),
-       text()
+Label::Label(const string &t)
 {
        focusable = false;
-       update_style();
        set_text(t);
 }
 
 void Label::autosize()
 {
-       geom.h = text.get_height();
-       geom.w = text.get_width();
+       if(!style)
+               return;
+
+       Widget::autosize();
+
        if(const Part *text_part = style->get_part("text"))
        {
                const Sides &margin = text_part->get_margin();
-               geom.w += margin.left+margin.right;
-               geom.h += margin.top+margin.bottom;
+               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()
@@ -53,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 &>(wdg).text = t;
+       obj.text = t;
 }
 
 } // namespace GLtk