X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flist.cpp;h=5d765008765c9ccbece8c28e77c9a62da5a4cecb;hb=9faf932be00ba7ec7ed8c81f1e7971dcfa2b2085;hp=6496018380ffbb12411d4a24eb26caa50c9995cd;hpb=1597579a34a8d87d4dea0a0cdc0895e6247b6126;p=libs%2Fgltk.git diff --git a/source/list.cpp b/source/list.cpp index 6496018..5d76500 100644 --- a/source/list.cpp +++ b/source/list.cpp @@ -2,6 +2,7 @@ #include #include #include +#include #include "graphic.h" #include "list.h" #include "part.h" @@ -43,7 +44,11 @@ void List::init() first = 0; max_scroll = 0; view_size = 5; + items_part = 0; ignore_slider_change = false; + dragging = false; + drag_start_x = 0; + drag_start_y = 0; observer = new DataObserver(*this); @@ -67,18 +72,16 @@ void List::autosize_special(const Part &part, Geometry &ageom) const const Sides &margin = part.get_margin(); unsigned max_w = 0; - unsigned total_h = 0; + unsigned max_h = 0; for(unsigned i=0; iautosize(igeom); max_w = max(max_w, igeom.w); - if(view_size==0 || iset_active(true); - set_input_focus(items[focus_index]); + if(state&FOCUS) + set_input_focus(items[focus_index]); signal_item_selected.emit(sel_index); } } +void List::set_selected_item(Widget *item) +{ + for(unsigned i=first; (iis_visible()); ++i) + if(item==items[i]) + return set_selected_index(i); +} + void List::rebuild_special(const Part &part) { if(part.get_name()=="slider") @@ -223,6 +234,18 @@ void List::render_special(const Part &part, GL::Renderer &renderer) const slider.render(renderer); } +bool List::key_press(unsigned key, unsigned mod) +{ + if(key==Input::KEY_UP && mod==MOD_CTRL) + move_focus(NAV_UP, false); + else if(key==Input::KEY_DOWN && mod==MOD_CTRL) + move_focus(NAV_DOWN, false); + else + return false; + + return true; +} + void List::button_press(int x, int y, unsigned btn) { if(btn==4 || btn==5) @@ -243,55 +266,82 @@ 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; - } - } + set_selected_item(click_focus); } } -void List::focus_in() +void List::touch_press(int x, int y, unsigned finger) { - if(focus_index<0) - focus_index = sel_index; - - if(focus_index>=0) + if(finger==0) { - scroll_to_focus(); - set_input_focus(items[focus_index]); + dragging = true; + drag_start_x = x; + drag_start_y = y; } } -bool List::navigate(Navigation nav) +void List::touch_release(int x, int y, unsigned finger) { - if(nav==NAV_UP) + if(finger==0) { - if(focus_index<0 && !items.empty()) - focus_index = items.size()-1; - else if(focus_index>0) - --focus_index; - else - return false; - - scroll_to_focus(); - set_input_focus(items[focus_index]); + int dx = x-drag_start_x; + int dy = y-drag_start_y; + if(dx*dx+dy*dy<25) + { + Container::touch_press(drag_start_x, drag_start_y, finger); + if(touch_focus) + set_selected_item(touch_focus); + Container::touch_motion(x, y, finger); + Container::touch_release(x, y, finger); + } + dragging = false; } - else if(nav==NAV_DOWN) +} + +void List::touch_motion(int, int y, unsigned finger) +{ + if(finger==0 && !items.empty() && dragging) { - if(focus_index<0 && !items.empty()) - focus_index = 0; - else if(static_cast(focus_index+1)0 && firstget_geometry().h; + if(dy>item_h) + { + drag_start_y += item_h; + slider.set_value(max_scroll-(first+1)); + } + } + else if(dy<0 && first>0) + { + int item_h = items[first-1]->get_geometry().h; + if(-dy>item_h) + { + drag_start_y -= item_h; + slider.set_value(max_scroll-(first-1)); + } + } + } +} - scroll_to_focus(); +void List::focus_in() +{ + Container::focus_in(); + if(focus_index>=0 && items[focus_index]->is_visible()) set_input_focus(items[focus_index]); + else + { + if(sel_index>=0 && items[sel_index]->is_visible()) + set_focus_index(sel_index); + else if(!items.empty()) + set_focus_index(first); } +} + +bool List::navigate(Navigation nav) +{ + if((nav==NAV_UP || nav==NAV_DOWN) && !items.empty()) + move_focus(nav, true); else if(nav==NAV_ACTIVATE) set_selected_index(focus_index); else @@ -300,6 +350,39 @@ bool List::navigate(Navigation nav) return true; } +void List::on_style_change() +{ + items_part = (style ? style->get_part("items") : 0); +} + +void List::move_focus(Navigation nav, bool select) +{ + if(nav==NAV_UP) + { + if(focus_index>0) + set_focus_index(focus_index-1); + } + else if(nav==NAV_DOWN) + { + if(static_cast(focus_index+1)=0) + { + scroll_to_focus(); + if(state&FOCUS) + set_input_focus(items[focus_index]); + } +} + void List::item_autosize_changed(Item *item) { item->autosize(); @@ -309,15 +392,11 @@ void List::item_autosize_changed(Item *item) unsigned List::last_to_first(unsigned last) const { - if(!style) + if(!items_part) return last; - unsigned view_h = geom.h; - if(const Part *items_part = style->get_part("items")) - { - const Sides &margin = items_part->get_margin(); - view_h -= margin.top+margin.bottom; - } + const Sides &margin = items_part->get_margin(); + unsigned view_h = geom.h-min(geom.h, margin.top+margin.bottom); unsigned items_h = 0; for(unsigned i=last; iwidget; + child->autosize(); + if(const Part *part = style->get_part("children")) + { + const Sides &margin = part->get_margin(); + child->set_position(margin.left, margin.bottom); + } +} + + void List::MultiColumnItem::check_widths(vector &widths) const { if(widths.size()get_part("children")) - { - const Sides &margin = part->get_margin(); - label.set_position(margin.left, margin.bottom); - } -} - List::Loader::Loader(List &l): DataFile::DerivedObjectLoader(l)