From: Mikko Rasa Date: Sat, 11 Jan 2014 18:06:44 +0000 (+0200) Subject: Fix a case where rebuild was called recursively X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=dd64d5f2e50cb17ad97631b0f577f4bf213d3da5;p=libs%2Fgltk.git Fix a case where rebuild was called recursively --- diff --git a/source/list.cpp b/source/list.cpp index 14c779f..f42d573 100644 --- a/source/list.cpp +++ b/source/list.cpp @@ -1,3 +1,4 @@ +#include #include #include #include @@ -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(value); rebuild(); diff --git a/source/list.h b/source/list.h index 5b43661..8e9a851 100644 --- a/source/list.h +++ b/source/list.h @@ -140,6 +140,7 @@ private: unsigned first; unsigned max_scroll; unsigned view_size; + bool ignore_slider_change; VSlider slider; std::vector items;