Add a persistent view size attribute to List

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

diff --git a/source/widget.cpp b/source/widget.cpp
index bbd2e8877af608b1255d21eb10d9b23d2506fba4..f642004e07c3825fc1a79432f7a3acc237c1dadc 100644 (file)
--- a/source/widget.cpp
+++ b/source/widget.cpp
@@ -30,30 +30,29 @@ Widget::~Widget()
 
 void Widget::set_position(int x, int y)
 {
-       geom.x = x;
-       geom.y = y;
-       on_geometry_change();
-       rebuild();
+       set_geometry(Geometry(x, y, geom.w, geom.h));
 }
 
 void Widget::set_size(unsigned w, unsigned h)
 {
-       geom.w = w;
-       geom.h = h;
-       on_geometry_change();
-       rebuild();
+       set_geometry(Geometry(geom.x, geom.y, w, h));
 }
 
 void Widget::autosize()
 {
+       if(!style)
+               return;
+
        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);
+                       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);
                }
 }
 
@@ -157,19 +156,22 @@ void Widget::rebuild()
        if(!style)
                return;
 
+       part_cache.clear();
        const Style::PartSeq &parts = style->get_parts();
-       list<CachedPart>::iterator j = cached_parts.begin();
-       for(Style::PartSeq::const_iterator i=parts.begin(); i!=parts.end(); ++i, ++j)
+       for(Style::PartSeq::const_iterator i=parts.begin(); i!=parts.end(); ++i)
        {
-               if(j==cached_parts.end())
-                       j = cached_parts.insert(j, CachedPart());
                if(i->get_name().empty())
-                       i->build(geom, state, *j);
+                       i->build(geom, state, part_cache);
                else
-                       rebuild_special(*i, *j);
+                       rebuild_special(*i);
        }
 }
 
+void Widget::rebuild_special(const Part &part)
+{
+       part_cache.insert_special(part);
+}
+
 void Widget::render(GL::Renderer &renderer) const
 {
        if(!style)
@@ -177,17 +179,16 @@ void Widget::render(GL::Renderer &renderer) const
 
        GL::MatrixStack::Push _pushm(renderer.matrix_stack());
        renderer.matrix_stack() *= GL::Matrix::translation(geom.x, geom.y, 0);
-       const Style::PartSeq &parts = style->get_parts();
-       list<CachedPart>::const_iterator j = cached_parts.begin();
-       for(Style::PartSeq::const_iterator i=parts.begin(); (i!=parts.end() && j!=cached_parts.end()); ++i, ++j)
+       const PartCache::PartList &parts = part_cache.get_parts();
+       for(PartCache::PartList::const_iterator i=parts.begin(); i!=parts.end(); ++i)
        {
-               if(j->mesh && j->texture)
+               if(i->mesh && i->texture)
                {
-                       renderer.set_texture(j->texture);
-                       j->mesh->draw(renderer);
+                       renderer.set_texture(i->texture);
+                       i->mesh->draw(renderer);
                }
-               else if(!i->get_name().empty())
-                       render_special(*i, renderer);
+               else if(i->part)
+                       render_special(*i->part, renderer);
        }
 }