Rework how widget ownership works in Container

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

diff --git a/source/label.cpp b/source/label.cpp
index 9676fa37ab148bfaccb23d1ccc65b38f363d48d7..033bfd9296b07051bdd04691d0ba6d2d65985fff 100644 (file)
--- a/source/label.cpp
+++ b/source/label.cpp
@@ -1,39 +1,51 @@
 #include "label.h"
 #include "part.h"
+#include "style.h"
+
+using namespace std;
 
 namespace Msp {
 namespace GLtk {
 
-Label::Label(const Resources &r, const std::string &t):
-       Widget(r)
+Label::Label(const string &t)
 {
        set_text(t);
-       update_style();
 }
 
-void Label::set_text(const std::string &t)
+void Label::set_text(const string &t)
+{
+       text = t;
+       signal_autosize_changed.emit();
+       mark_rebuild();
+}
+
+void Label::autosize_special(const Part &part, Geometry &ageom) const
 {
-       text=t;
+       if(part.get_name()=="text")
+               text.autosize(part, ageom);
 }
 
-void Label::render_part(const Part &part) const
+void Label::rebuild_special(const Part &part)
 {
        if(part.get_name()=="text")
-               render_text(part, text);
-       else
-               Widget::render_part(part);
+               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", &Label::text);
+       add("text", &Loader::text);
 }
 
-Label &Label::Loader::get_object()
+void Label::Loader::text(const string &t)
 {
-       return static_cast<Label &>(wdg);
+       obj.text = t;
 }
 
 } // namespace GLtk