X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fwidget.cpp;h=17bc4e3c95c96a6aed1f3e5eb14129b6951fdd72;hb=b92c878a286036af106e969a29b2689876aa5f65;hp=9cd9066bc82663150daa9ad8fddc65b629650c02;hpb=2bdaf4955fdb94e73704adcdcf0adc2b353f0ff0;p=libs%2Fgltk.git

diff --git a/source/widget.cpp b/source/widget.cpp
index 9cd9066..17bc4e3 100644
--- a/source/widget.cpp
+++ b/source/widget.cpp
@@ -47,6 +47,19 @@ 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;
@@ -89,6 +102,7 @@ void Widget::update_style()
 	}
 
 	on_style_change();
+	signal_autosize_changed.emit();
 }
 
 void Widget::set_tooltip(const string &t)
@@ -128,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())
 		{
@@ -163,7 +178,7 @@ void Widget::focus_out()
 
 
 Widget::Loader::Loader(Widget &w):
-	wdg(w)
+	DataFile::ObjectLoader<Widget>(w)
 {
 	add("position", &Loader::position);
 	add("size",     &Loader::size);
@@ -173,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