Avoid segfault with a single multi-column item

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

diff --git a/source/list.cpp b/source/list.cpp
index 461d5e425c3076426f8ad51029ee971825cf396f..2a0aa066e98b0a8447df6989a0f7a29ac8a06b8b 100644 (file)
--- a/source/list.cpp
+++ b/source/list.cpp
@@ -65,7 +65,8 @@ void List::autosize_special(const Part &part, Geometry &ageom) const
                unsigned total_h = 0;
                for(unsigned i=0; i<items.size(); ++i)
                {
-                       const Geometry &igeom = items[i]->get_geometry();
+                       Geometry igeom;
+                       items[i]->autosize(igeom);
                        max_w = max(max_w, igeom.w);
                        if(view_size==0 || i<view_size)
                                total_h += igeom.h;
@@ -120,8 +121,7 @@ List::Item *List::create_item(unsigned index)
        else
                item = new BasicItem(data->get_string(index));
        add(*item);
-       item->autosize();
-       item->signal_autosize_changed.connect(sigc::bind(sigc::mem_fun(this, &List::item_autosize_changed), item));
+       item->signal_autosize_changed.connect(sigc::mem_fun(this, &List::item_autosize_changed));
        return item;
 }
 
@@ -213,10 +213,9 @@ void List::reposition_slider()
        }
 }
 
-void List::item_autosize_changed(Item *item)
+void List::item_autosize_changed()
 {
        signal_autosize_changed.emit();
-       item->autosize();
        reposition_items();
 }
 
@@ -228,15 +227,16 @@ void List::reposition_items()
        if(const Part *items_part = style->get_part("items"))
        {
                const Sides &margin = items_part->get_margin();
-               unsigned w = geom.w-margin.left-margin.right;
-               unsigned y = geom.h-margin.top;
+               unsigned w = geom.w-min(geom.w, margin.left+margin.right);
+               unsigned y = geom.h-min(geom.h, margin.top);
                for(unsigned i=0; i<items.size(); ++i)
                {
                        if(i<first || !y)
                                items[i]->set_visible(false);
                        else
                        {
-                               Geometry igeom = items[i]->get_geometry();
+                               Geometry igeom;
+                               items[i]->autosize(igeom);
                                if(igeom.h+margin.bottom<=y)
                                {
                                        items[i]->set_visible(true);
@@ -351,7 +351,8 @@ void List::Item::autosize_special(const Part &part, Geometry &ageom) const
                const Sides &margin = part.get_margin();
                for(list<Child *>::const_iterator i=children.begin(); i!=children.end(); ++i)
                {
-                       const Geometry &cgeom = (*i)->widget->get_geometry();
+                       Geometry cgeom;
+                       (*i)->widget->autosize(cgeom);
                        ageom.w = max(ageom.w, cgeom.x+cgeom.w+margin.right);
                        ageom.h = max(ageom.h, cgeom.y+cgeom.h+margin.top);
                }
@@ -373,6 +374,72 @@ void List::Item::render_special(const Part &part, GL::Renderer &renderer) const
 }
 
 
+void List::MultiColumnItem::check_widths(vector<unsigned> &widths) const
+{
+       if(widths.size()<children.size())
+               widths.resize(children.size(), 0);
+
+       unsigned n = 0;
+       for(list<Child *>::const_iterator i=children.begin(); i!=children.end(); ++i, ++n)
+       {
+               Geometry cgeom;
+               (*i)->widget->autosize(cgeom);
+               // TODO invent a better way to specify spacings
+               widths[n] = max(widths[n], cgeom.w+8);
+       }
+}
+
+void List::MultiColumnItem::set_widths(const vector<unsigned> &widths)
+{
+       if(!style)
+               return;
+
+       const Part *part = style->get_part("children");
+       if(!part)
+               return;
+
+       const Sides &margin = part->get_margin();
+       int x = margin.left;
+       unsigned n = 0;
+       for(list<Child *>::const_iterator i=children.begin(); i!=children.end(); ++i, ++n)
+       {
+               (*i)->widget->set_position(x, margin.bottom);
+               x += widths[n];
+       }
+}
+
+void List::MultiColumnItem::on_style_change()
+{
+       if(!style)
+               return;
+
+       for(std::list<Child *>::const_iterator i=children.begin(); i!=children.end(); ++i)
+               (*i)->widget->autosize();
+
+       vector<unsigned> widths;
+       List *list = static_cast<List *>(parent);
+       for(vector<Item *>::const_iterator i=list->items.begin(); i!=list->items.end(); ++i)
+               if(*i!=this)
+                       if(MultiColumnItem *mci = dynamic_cast<MultiColumnItem *>(*i))
+                               mci->check_widths(widths);
+
+       vector<unsigned> self_widths(widths);
+       check_widths(self_widths);
+       bool update_all = false;
+       for(unsigned i=0; (!update_all && i<widths.size() && i<self_widths.size()); ++i)
+               update_all = self_widths[i]>widths[i];
+
+       if(update_all)
+       {
+               for(vector<Item *>::const_iterator i=list->items.begin(); i!=list->items.end(); ++i)
+                       if(MultiColumnItem *mci = dynamic_cast<MultiColumnItem *>(*i))
+                               mci->set_widths(self_widths);
+       }
+       else
+               set_widths(self_widths);
+}
+
+
 List::BasicItem::BasicItem(const string &text):
        label(text)
 {