X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flist.cpp;h=0f887f3a6641316a6610da9f403a4bc5abefb7f4;hb=08b48157dc9ca5a4bd59d8eec9fa4e3bff8f0503;hp=042eb20ab7b85dbd052d3274351b03287c09614e;hpb=1afb4f8d6379ad1bf832692fbfedef9714ee3ff5;p=libs%2Fgltk.git diff --git a/source/list.cpp b/source/list.cpp index 042eb20..0f887f3 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); @@ -110,20 +112,22 @@ void List::set_data(ListData &d) void List::items_changed() { - check_view_range(); signal_autosize_changed.emit(); - reposition_items(); + rebuild(); } List::Item *List::create_item(unsigned index) { - Item *item = 0; + Item *item = 0; if(item_factory) item = item_factory->create_item(index); else item = new BasicItem(data->get_string(index)); + if(static_cast(index)==sel_index) + item->set_active(true); add(*item); - item->signal_autosize_changed.connect(sigc::mem_fun(this, &List::item_autosize_changed)); + item->autosize(); + item->signal_autosize_changed.connect(sigc::bind(sigc::mem_fun(this, &List::item_autosize_changed), item)); return item; } @@ -143,13 +147,16 @@ void List::set_selected_index(int i) if(i>=static_cast(data->size())) throw out_of_range("List::set_selected_index"); - if(i==sel_index) + if(i==sel_index || (i<0 && sel_index<0)) return; if(sel_index>=0) items[sel_index]->set_active(false); if(i<0) + { sel_index = -1; + signal_selection_cleared.emit(); + } else { sel_index = i; @@ -162,65 +169,12 @@ void List::rebuild_special(const Part &part) { if(part.get_name()=="slider") reposition_child(slider, part); - Widget::rebuild_special(part); -} - -void List::render_special(const Part &part, GL::Renderer &renderer) const -{ - if(part.get_name()=="items") + else if(part.get_name()=="items") { - for(unsigned i=first; (iis_visible()); ++i) - items[i]->render(renderer); - } - else if(part.get_name()=="slider") - slider.render(renderer); -} - -void List::button_press(int x, int y, unsigned btn) -{ - Container::button_press(x, y, btn); - if(click_focus && btn==1) - { - for(unsigned i=first; (iis_visible()); ++i) - if(click_focus==items[i]) - { - set_selected_index(i); - break; - } - } -} - -void List::on_geometry_change() -{ - reposition_items(); - - check_view_range(); -} - -void List::on_style_change() -{ - if(!style) - return; - - reposition_items(); - - check_view_range(); -} - -void List::item_autosize_changed() -{ - signal_autosize_changed.emit(); - reposition_items(); -} - -void List::reposition_items() -{ - if(!style) - return; + SetFlag flag(ignore_slider_change); + check_view_range(); - if(const Part *items_part = style->get_part("items")) - { - const Sides &margin = items_part->get_margin(); + 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); for(unsigned i=0; iset_visible(false); else { - Geometry igeom; - items[i]->autosize(igeom); + Geometry igeom = items[i]->get_geometry(); if(igeom.h+margin.bottom<=y) { items[i]->set_visible(true); @@ -248,6 +201,57 @@ void List::reposition_items() } } } + + Widget::rebuild_special(part); +} + +void List::render_special(const Part &part, GL::Renderer &renderer) const +{ + if(part.get_name()=="items") + { + for(unsigned i=first; (iis_visible()); ++i) + items[i]->render(renderer); + } + else if(part.get_name()=="slider") + slider.render(renderer); +} + +void List::button_press(int x, int y, unsigned btn) +{ + if(btn==4 || btn==5) + { + unsigned change = 3; + if(btn==4) + { + change = min(first, change); + slider.set_value(max_scroll-(first-change)); + } + else if(btn==5) + { + change = min(max_scroll-first, change); + slider.set_value(max_scroll-(first+change)); + } + } + else + { + Container::button_press(x, y, btn); + if(click_focus && btn==1) + { + for(unsigned i=first; (iis_visible()); ++i) + if(click_focus==items[i]) + { + set_selected_index(i); + break; + } + } + } +} + +void List::item_autosize_changed(Item *item) +{ + item->autosize(); + signal_autosize_changed.emit(); + rebuild(); } void List::check_view_range() @@ -282,10 +286,10 @@ 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); - reposition_items(); + rebuild(); } } @@ -311,6 +315,7 @@ void List::DataObserver::item_added(unsigned i) void List::DataObserver::item_removed(unsigned i) { + bool had_selection = (list.sel_index>=0); if(list.sel_index>static_cast(i)) --list.sel_index; else if(list.sel_index==static_cast(i)) @@ -319,6 +324,9 @@ void List::DataObserver::item_removed(unsigned i) delete list.items[i]; list.items.erase(list.items.begin()+i); list.items_changed(); + + if(had_selection && list.sel_index<0) + list.signal_selection_cleared.emit(); } void List::DataObserver::cleared() @@ -328,11 +336,15 @@ void List::DataObserver::cleared() delete *i; list.items.clear(); list.items_changed(); + + list.signal_selection_cleared.emit(); } void List::DataObserver::refresh_item(unsigned i) { delete list.items[i]; + // Avoid stale pointer while create_item is executing + list.items[i] = 0; list.items[i] = list.create_item(i); list.items_changed(); } @@ -429,8 +441,8 @@ void List::MultiColumnItem::on_style_change() if(MultiColumnItem *mci = dynamic_cast(*i)) mci->set_widths(self_widths); } - else - set_widths(self_widths); + + set_widths(self_widths); }