Rearrange members

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

diff --git a/source/label.cpp b/source/label.cpp
index ae821a81f0f6330dc42ac6c3f15ce18ac85d21d9..6db6aa37820b593fa693cce70de22b65da469b2f 100644 (file)
--- a/source/label.cpp
+++ b/source/label.cpp
@@ -14,35 +14,30 @@ 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()
 {
-       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;
+       if(!style)
+               return;
 
-       geom.h=text.get_height();
-       geom.w=text.get_width();
-       if(text_part)
+       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;
+               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
@@ -51,6 +46,11 @@ void Label::render_special(const Part &part) const
                text.render(part, geom);
 }
 
+void Label::on_style_change()
+{
+       text.set_style(style);
+}
+
 
 Label::Loader::Loader(Label &l):
        Widget::Loader(l)
@@ -60,7 +60,7 @@ Label::Loader::Loader(Label &l):
 
 void Label::Loader::text(const string &t)
 {
-       static_cast<Label &>(wdg).text=t;
+       static_cast<Label &>(wdg).text = t;
 }
 
 } // namespace GLtk