Add a signal to notify when the automatic size of a widget changes

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

diff --git a/source/widget.cpp b/source/widget.cpp
index 434ec454ea022beb1a31964025c7a98808d25d8f..17bc4e3c95c96a6aed1f3e5eb14129b6951fdd72 100644 (file)
--- a/source/widget.cpp
+++ b/source/widget.cpp
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of libmspgltk
-Copyright © 2007-2009  Mikko Rasa, Mikkosoft Productions
+Copyright © 2007-2011  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
@@ -47,18 +47,64 @@ void Widget::set_size(unsigned w, unsigned h)
        on_geometry_change();
 }
 
+void Widget::autosize()
+{
+       geom.w = 0;
+       geom.h = 0;
+       const Style::PartSeq &parts = style->get_parts();
+       for(Style::PartSeq::const_iterator i=parts.begin(); i!=parts.end(); ++i)
+               if(i->get_name().empty())
+               {
+                       geom.w = max(geom.w, i->get_geometry().w);
+                       geom.h = max(geom.h, i->get_geometry().h);
+               }
+}
+
 void Widget::set_geometry(const Geometry &g)
 {
        geom = g;
        on_geometry_change();
 }
 
+void Widget::set_parent(Container *p)
+{
+       if(parent && p)
+               throw InvalidState("Widget is already in a Container");
+       parent = p;
+
+       on_reparent();
+       update_style();
+}
+
 void Widget::set_style(const string &s)
 {
        style_name = s;
        update_style();
 }
 
+void Widget::update_style()
+{
+       Widget *top;
+       for(top=this; top->parent; top=top->parent) ;
+       Root *root = dynamic_cast<Root *>(top);
+       if(!root)
+               style = 0;
+       else
+       {
+               string sname = get_class();
+               if(!style_name.empty())
+               {
+                       sname += '-';
+                       sname += style_name;
+               }
+
+               style = root->get_resources().get<Style>(sname);
+       }
+
+       on_style_change();
+       signal_autosize_changed.emit();
+}
+
 void Widget::set_tooltip(const string &t)
 {
        tooltip = t;
@@ -96,7 +142,8 @@ void Widget::render() const
 
        GL::push_matrix();
        GL::translate(geom.x, geom.y, 0);
-       for(PartSeq::const_iterator i=style->get_parts().begin(); i!=style->get_parts().end(); ++i)
+       const Style::PartSeq &parts = style->get_parts();
+       for(Style::PartSeq::const_iterator i=parts.begin(); i!=parts.end(); ++i)
        {
                if(i->get_name().empty())
                {
@@ -129,51 +176,9 @@ void Widget::focus_out()
        state &= ~FOCUS;
 }
 
-void Widget::update_style()
-{
-       Widget *top;
-       for(top=this; top->parent; top=top->parent) ;
-       Root *root = dynamic_cast<Root *>(top);
-       if(!root)
-               style = 0;
-       else
-       {
-               string sname = get_class();
-               if(!style_name.empty())
-               {
-                       sname += '-';
-                       sname += style_name;
-               }
-
-               style = root->get_resources().get<Style>(sname);
-       }
-
-       on_style_change();
-}
-
-void Widget::update_style(Widget &w)
-{
-       w.update_style();
-}
-
-void Widget::set_parent(Container *p)
-{
-       if(parent && p)
-               throw InvalidState("Widget is already in a Container");
-       parent = p;
-
-       on_reparent();
-       update_style();
-}
-
-void Widget::set_parent(Widget &w, Container *p)
-{
-       w.set_parent(p);
-}
-
 
 Widget::Loader::Loader(Widget &w):
-       wdg(w)
+       DataFile::ObjectLoader<Widget>(w)
 {
        add("position", &Loader::position);
        add("size",     &Loader::size);
@@ -183,17 +188,17 @@ Widget::Loader::Loader(Widget &w):
 
 void Widget::Loader::position(int x, int y)
 {
-       wdg.set_position(x, y);
+       obj.set_position(x, y);
 }
 
 void Widget::Loader::size(unsigned w, unsigned h)
 {
-       wdg.set_size(w, h);
+       obj.set_size(w, h);
 }
 
 void Widget::Loader::style(const string &s)
 {
-       wdg.set_style(s);
+       obj.set_style(s);
 }
 
 } // namespace GLtk