Always set column widths on the item itself

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

diff --git a/source/list.cpp b/source/list.cpp
index 14c779f0f579dc236eae5049e5c4720e94760591..1b26a3ff7b20055ee7e773d585d86e09dab42371 100644 (file)
--- a/source/list.cpp
+++ b/source/list.cpp
@@ -1,3 +1,4 @@
+#include <msp/core/raii.h>
 #include <msp/debug/demangle.h>
 #include <msp/gl/matrix.h>
 #include <msp/gl/meshbuilder.h>
@@ -39,6 +40,7 @@ void List::init()
        first = 0;
        max_scroll = 0;
        view_size = 5;
+       ignore_slider_change = false;
 
        observer = new DataObserver(*this);
 
@@ -164,6 +166,9 @@ void List::rebuild_special(const Part &part)
                reposition_child(slider, part);
        else if(part.get_name()=="items")
        {
+               SetFlag flag(ignore_slider_change);
+               check_view_range();
+
                const Sides &margin = part.get_margin();
                unsigned w = geom.w-min(geom.w, margin.left+margin.right);
                unsigned y = geom.h-min(geom.h, margin.top);
@@ -190,8 +195,6 @@ void List::rebuild_special(const Part &part)
                                }
                        }
                }
-
-               check_view_range();
        }
 
        Widget::rebuild_special(part);
@@ -261,7 +264,7 @@ void List::check_view_range()
 
 void List::slider_value_changed(double value)
 {
-       if(max_scroll>0)
+       if(max_scroll>0 && !ignore_slider_change)
        {
                first = max_scroll-static_cast<unsigned>(value);
                rebuild();
@@ -410,8 +413,8 @@ void List::MultiColumnItem::on_style_change()
                        if(MultiColumnItem *mci = dynamic_cast<MultiColumnItem *>(*i))
                                mci->set_widths(self_widths);
        }
-       else
-               set_widths(self_widths);
+
+       set_widths(self_widths);
 }