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 ae821a81f0f6330dc42ac6c3f15ce18ac85d21d9..c59e71851d3ceaee9b91ce71203087b79220e35d 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,53 +7,46 @@ using namespace std;
 namespace Msp {
 namespace GLtk {
 
-Label::Label(const Resources &r, const string &t):
-       Widget(r),
-       text(style)
+Label::Label(const string &t)
 {
-       update_style();
+       focusable = false;
        set_text(t);
 }
 
-void Label::autosize()
+void Label::set_text(const string &t)
 {
-       const list<Part> &parts=style->get_parts();
-       const Part *text_part=0;
-       for(list<Part>::const_iterator i=parts.begin(); (!text_part && i!=parts.end()); ++i)
-               if(i->get_name()=="text")
-                       text_part=&*i;
-
-       geom.h=text.get_height();
-       geom.w=text.get_width();
-       if(text_part)
-       {
-               const Sides &margin=text_part->get_margin();
-               geom.w+=margin.left+margin.right;
-               geom.h+=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()
+{
+       text.set_style(style);
 }
 
 
 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