X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fwidget.cpp;h=7496f8bdda1e849c3f35768d2d2ca6f29a11f503;hb=d2d5b4c4dedf90a42dd2baff8334318b1d000f64;hp=f642004e07c3825fc1a79432f7a3acc237c1dadc;hpb=c8291177b545ec81930603a5915234a60296db51;p=libs%2Fgltk.git diff --git a/source/widget.cpp b/source/widget.cpp index f642004..7496f8b 100644 --- a/source/widget.cpp +++ b/source/widget.cpp @@ -43,17 +43,22 @@ void Widget::autosize() if(!style) return; - geom.w = 0; - geom.h = 0; + Geometry ageom; const Style::PartSeq &parts = style->get_parts(); for(Style::PartSeq::const_iterator i=parts.begin(); i!=parts.end(); ++i) + { if(i->get_name().empty()) { const Geometry &pgeom = i->get_geometry(); const Sides &pmargin = i->get_margin(); - geom.w = max(geom.w, pgeom.w+pmargin.left+pmargin.right); - geom.h = max(geom.h, pgeom.h+pmargin.top+pmargin.bottom); + ageom.w = max(ageom.w, pgeom.w+pmargin.left+pmargin.right); + ageom.h = max(ageom.h, pgeom.h+pmargin.top+pmargin.bottom); } + else + autosize_special(*i, ageom); + } + + set_geometry(ageom); } void Widget::set_geometry(const Geometry &g)