Refactor widget autosizing

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

diff --git a/source/label.cpp b/source/label.cpp
index f42646709a3f90e43786742790df4f9e19eb2775..e6b7efb0192b460185df5ac4d11a870ceb20e339 100644 (file)
--- a/source/label.cpp
+++ b/source/label.cpp
@@ -13,23 +13,6 @@ Label::Label(const string &t)
        set_text(t);
 }
 
-void Label::autosize()
-{
-       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);
-       }
-
-       rebuild();
-}
-
 void Label::set_text(const string &t)
 {
        text = t;
@@ -37,6 +20,12 @@ void Label::set_text(const string &t)
        rebuild();
 }
 
+void Label::autosize_special(const Part &part, Geometry &ageom)
+{
+       if(part.get_name()=="text")
+               text.autosize(part, ageom);
+}
+
 void Label::rebuild_special(const Part &part)
 {
        if(part.get_name()=="text")