Make autosize_special const and add a const autosize overload

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

diff --git a/source/label.cpp b/source/label.cpp
index 30ccd62d16859a6555e95eb2bd7d3180e58c0fc5..c59e71851d3ceaee9b91ce71203087b79220e35d 100644 (file)
--- a/source/label.cpp
+++ b/source/label.cpp
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of libmspgltk
-Copyright © 2007, 2009-2011  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include "label.h"
 #include "part.h"
 #include "style.h"
@@ -20,30 +13,23 @@ Label::Label(const string &t)
        set_text(t);
 }
 
-void Label::autosize()
+void Label::set_text(const string &t)
 {
-       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);
-       }
+       text = t;
+       signal_autosize_changed.emit();
+       rebuild();
 }
 
-void Label::set_text(const string &t)
+void Label::autosize_special(const Part &part, Geometry &ageom) const
 {
-       text = t;
+       if(part.get_name()=="text")
+               text.autosize(part, ageom);
 }
 
-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, state, geom, part_cache);
 }
 
 void Label::on_style_change()
@@ -53,14 +39,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