Rearrange members

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

diff --git a/source/label.cpp b/source/label.cpp
index 0e0134d73766a4cb5f05830386d772790d6dca7d..6db6aa37820b593fa693cce70de22b65da469b2f 100644 (file)
--- a/source/label.cpp
+++ b/source/label.cpp
@@ -7,38 +7,60 @@ Distributed under the LGPL
 
 #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)
 {
+       focusable = false;
        set_text(t);
-       update_style();
 }
 
-void Label::set_text(const std::string &t)
+void Label::autosize()
+{
+       if(!style)
+               return;
+
+       geom.h = text.get_height();
+       geom.w = text.get_width();
+       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;
+       }
+}
+
+void Label::set_text(const string &t)
 {
-       text=t;
+       text = t;
 }
 
 void Label::render_special(const Part &part) const
 {
        if(part.get_name()=="text")
-               render_text(part, text);
+               text.render(part, geom);
+}
+
+void Label::on_style_change()
+{
+       text.set_style(style);
 }
 
 
 Label::Loader::Loader(Label &l):
        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);
+       static_cast<Label &>(wdg).text = t;
 }
 
 } // namespace GLtk