#include <msp/debug/demangle.h>
#include <msp/gl/matrix.h>
#include <msp/gl/meshbuilder.h>
+#include <msp/input/keys.h>
+#include <msp/strings/format.h>
#include "graphic.h"
#include "list.h"
#include "part.h"
#include "style.h"
#include "text.h"
-#include "vslider.h"
using namespace std;
{ }
-List::List():
- data(new BasicListData<string>),
- own_data(true)
+List::List(unique_ptr<ListData> d):
+ List(*d)
{
- init();
+ own_data = move(d);
}
+List::List():
+ List(make_unique<BasicListData<string>>())
+{ }
+
List::List(ListData &d):
data(&d),
- own_data(false)
+ observer(make_unique<DataObserver>(*this))
{
- init();
-}
-
-void List::init()
-{
- item_factory = 0;
- sel_index = -1;
- first = 0;
- max_scroll = 0;
- view_size = 5;
- ignore_slider_change = false;
-
- observer = new DataObserver(*this);
+ input_type = INPUT_NAVIGATION;
add(slider);
slider.set_step(1);
slider.signal_value_changed.connect(sigc::mem_fun(this, &List::slider_value_changed));
}
-List::~List()
-{
- delete item_factory;
- delete observer;
- if(own_data)
- delete data;
-}
-
void List::autosize_special(const Part &part, Geometry &ageom) const
{
if(part.get_name()=="items")
{
const Sides &margin = part.get_margin();
- unsigned max_w = 0;
- unsigned total_h = 0;
- for(unsigned i=0; i<items.size(); ++i)
+ unsigned items_w = 0;
+ unsigned items_h = 0;
+ for(size_t i=0; i<items.size(); ++i)
{
Geometry igeom;
items[i]->autosize(igeom);
- max_w = max(max_w, igeom.w);
- if(view_size==0 || i<view_size)
- total_h += igeom.h;
+ items_w = max(items_w, igeom.w);
+ items_h = max(items_h, igeom.h);
}
- if(!items.empty() && items.size()<view_size)
- total_h = total_h*view_size/items.size();
+ if(view_mode==GRID)
+ {
+ unsigned r = view_rows;
+ unsigned c = view_columns;
+ if(r==0 && c==0)
+ r = sqrt(items.size());
+ if(r==0)
+ r = (items.size()+c-1)/c;
+ if(c==0)
+ c = (items.size()+r-1)/r;
+ items_w *= c;
+ items_h *= r;
+ }
+ else
+ items_h *= (view_rows==0 ? items.size() : view_rows);
- ageom.w = max(ageom.w, max_w+margin.left+margin.right);
- ageom.h = max(ageom.h, total_h+margin.top+margin.bottom);
+ ageom.w = max(ageom.w, items_w+margin.left+margin.right);
+ ageom.h = max(ageom.h, items_h+margin.top+margin.bottom);
}
else if(part.get_name()=="slider")
autosize_child(slider, part, ageom);
if(item_factory)
item_factory->set_data(d);
- delete observer;
- if(own_data)
- delete data;
+ observer.reset();
+ own_data.reset();
data = &d;
- own_data = false;
- observer = new DataObserver(*this);
+ observer = make_unique<DataObserver>(*this);
- for(vector<Item *>::iterator i=items.begin(); i!=items.end(); ++i)
- delete *i;
items.clear();
- unsigned n_items = data->size();
- for(unsigned i=0; i<n_items; ++i)
- {
- Item *item = create_item(i);
- items.push_back(item);
- }
+ size_t n_items = data->size();
+ for(size_t i=0; i<n_items; ++i)
+ items.emplace_back(create_item(i));
items_changed();
}
void List::items_changed()
{
signal_autosize_changed.emit();
- rebuild();
+ mark_rebuild();
}
-List::Item *List::create_item(unsigned index)
+unique_ptr<List::Item> List::create_item(size_t index)
{
- Item *item = 0;
+ unique_ptr<Item> item;
if(item_factory)
item = item_factory->create_item(index);
else
- item = new BasicItem(data->get_string(index));
+ item = make_unique<BasicItem>(data->get_string(index));
+ if(index==sel_index)
+ item->set_active(true);
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::bind(sigc::mem_fun(this, &List::item_autosize_changed), item.get()));
return item;
}
void List::set_view_size(unsigned s)
{
- view_size = s;
+ set_view_size(s, s);
+}
+
+void List::set_view_size(unsigned r, unsigned c)
+{
+ view_rows = r;
+ view_columns = c;
signal_autosize_changed.emit();
}
set_view_size(0);
}
-void List::set_selected_index(int i)
+void List::set_selected_index(size_t i)
{
- if(i>=static_cast<int>(data->size()))
+ if(i>=data->size() && i!=INVALID_INDEX)
throw out_of_range("List::set_selected_index");
if(i==sel_index)
return;
- if(sel_index>=0)
+ if(sel_index!=INVALID_INDEX)
items[sel_index]->set_active(false);
- if(i<0)
- sel_index = -1;
+
+ sel_index = i;
+ focus_index = i;
+ if(i==INVALID_INDEX)
+ {
+ set_input_focus(nullptr);
+ signal_selection_cleared.emit();
+ }
else
{
- sel_index = i;
items[sel_index]->set_active(true);
+ if(state&FOCUS)
+ set_input_focus(items[focus_index].get());
signal_item_selected.emit(sel_index);
}
}
+void List::set_selected_item(Widget *item)
+{
+ for(size_t i=rows[first_row].first; (i<items.size() && items[i]->is_visible()); ++i)
+ if(item==items[i].get())
+ return set_selected_index(i);
+}
+
void List::rebuild_special(const Part &part)
{
if(part.get_name()=="slider")
else if(part.get_name()=="items")
{
SetFlag flag(ignore_slider_change);
+ reposition_items(true);
+ size_t old_first_row = first_row;
+ size_t old_max_scroll = max_scroll;
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);
- for(unsigned i=0; i<items.size(); ++i)
- {
- if(i<first || !y)
- items[i]->set_visible(false);
- else
- {
- Geometry igeom = items[i]->get_geometry();
- if(igeom.h+margin.bottom<=y)
- {
- items[i]->set_visible(true);
- y -= igeom.h;
- igeom.x = margin.left;
- igeom.y = y;
- igeom.w = w;
- items[i]->set_geometry(igeom);
- }
- else
- {
- items[i]->set_visible(false);
- y = 0;
- }
- }
- }
+ if(first_row!=old_first_row || max_scroll!=old_max_scroll)
+ reposition_items(false);
}
Widget::rebuild_special(part);
{
if(part.get_name()=="items")
{
- for(unsigned i=first; (i<items.size() && items[i]->is_visible()); ++i)
+ for(size_t i=rows[first_row].first; (i<items.size() && items[i]->is_visible()); ++i)
items[i]->render(renderer);
}
else if(part.get_name()=="slider")
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)
{
- Container::button_press(x, y, btn);
- if(click_focus && btn==1)
+ if(btn==4 || btn==5)
+ {
+ size_t change = 3;
+ if(btn==4)
+ {
+ change = min(first_row, change);
+ slider.set_value(max_scroll-(first_row-change));
+ }
+ else if(btn==5)
+ {
+ change = min(max_scroll-first_row, change);
+ slider.set_value(max_scroll-(first_row+change));
+ }
+ }
+ else
+ {
+ Container::button_press(x, y, btn);
+ if(click_focus && btn==1)
+ set_selected_item(click_focus);
+ }
+}
+
+void List::touch_press(int x, int y, unsigned finger)
+{
+ if(finger==0)
{
- for(unsigned i=first; (i<items.size() && items[i]->is_visible()); ++i)
- if(click_focus==items[i])
+ dragging = true;
+ drag_start_x = x;
+ drag_start_y = y;
+ }
+}
+
+void List::touch_release(int x, int y, unsigned finger)
+{
+ if(finger==0)
+ {
+ 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;
+ }
+}
+
+void List::touch_motion(int, int y, unsigned finger)
+{
+ if(finger==0 && !items.empty() && dragging)
+ {
+ int dy = y-drag_start_y;
+ if(dy>0 && first_row<max_scroll)
+ {
+ int row_h = rows[first_row].height;
+ if(dy>row_h)
+ {
+ drag_start_y += row_h;
+ slider.set_value(max_scroll-(first_row+1));
+ }
+ }
+ else if(dy<0 && first_row>0)
+ {
+ int row_h = rows[first_row-1].height;
+ if(-dy>row_h)
{
- set_selected_index(i);
- break;
+ drag_start_y -= row_h;
+ slider.set_value(max_scroll-(first_row-1));
}
+ }
+ }
+}
+
+void List::focus_in()
+{
+ Container::focus_in();
+ if(focus_index!=INVALID_INDEX && items[focus_index]->is_visible())
+ set_input_focus(items[focus_index].get());
+ else
+ {
+ if(sel_index!=INVALID_INDEX && items[sel_index]->is_visible())
+ set_focus_index(sel_index);
+ else if(!items.empty())
+ set_focus_index(rows[first_row].first);
+ }
+}
+
+bool List::navigate(Navigation nav)
+{
+ if((nav==NAV_UP || nav==NAV_DOWN || ((nav==NAV_LEFT || nav==NAV_RIGHT) && view_mode==GRID)) && !items.empty())
+ move_focus(nav, true);
+ else if(nav==NAV_ACTIVATE)
+ set_selected_index(focus_index);
+ else
+ return false;
+
+ return true;
+}
+
+void List::on_style_change()
+{
+ items_part = (style ? style->find_part("items") : nullptr);
+}
+
+void List::move_focus(Navigation nav, bool select)
+{
+ if(nav==NAV_UP && view_mode==GRID)
+ {
+ size_t row = item_index_to_row(focus_index);
+ if(row>0)
+ set_focus_index(rows[row-1].first+focus_index-rows[row].first);
+ else
+ set_focus_index(0);
+ }
+ else if(nav==NAV_DOWN && view_mode==GRID)
+ {
+ size_t row = item_index_to_row(focus_index);
+ if(row+1<rows.size())
+ set_focus_index(rows[row+1].first+focus_index-rows[row].first);
+ else
+ set_focus_index(items.size()-1);
+ }
+ else if(nav==NAV_UP || (nav==NAV_LEFT && view_mode==GRID))
+ {
+ if(focus_index>0)
+ set_focus_index(focus_index-1);
+ }
+ else if(nav==NAV_DOWN || (nav==NAV_RIGHT && view_mode==GRID))
+ {
+ if(focus_index+1<items.size())
+ set_focus_index(focus_index+1);
+ }
+
+ if(select)
+ set_selected_index(focus_index);
+}
+
+void List::set_focus_index(size_t i)
+{
+ focus_index = i;
+ if(focus_index!=INVALID_INDEX)
+ {
+ scroll_to_focus();
+ if(state&FOCUS)
+ set_input_focus(items[focus_index].get());
}
}
{
item->autosize();
signal_autosize_changed.emit();
- rebuild();
+ mark_rebuild();
}
-void List::check_view_range()
+void List::reposition_items(bool record_rows)
{
- if(!style)
+ if(!items_part)
return;
- unsigned h = geom.h;
- if(const Part *items_part = style->get_part("items"))
+ if(record_rows)
{
- const Sides &margin = items_part->get_margin();
- h -= margin.top+margin.bottom;
+ rows.clear();
+ rows.push_back(0);
}
- max_scroll = items.size();
- for(unsigned i=items.size(); i-->0; )
+ const Sides &margin = items_part->get_margin();
+ unsigned view_w = geom.w-min(geom.w, margin.left+margin.right);
+ unsigned x = 0;
+ unsigned y = 0;
+ unsigned row_h = 0;
+ for(size_t i=0; i<items.size(); ++i)
{
- unsigned ih = items[i]->get_geometry().h;
- if(ih<=h)
+ const Geometry &igeom = items[i]->get_geometry();
+
+ if(view_mode!=GRID || (x>0 && x+igeom.w>view_w))
+ {
+ x = 0;
+ if(y)
+ y -= row_h;
+ if(record_rows && i>0)
+ {
+ rows.back().height = row_h;
+ rows.push_back(i);
+ }
+ row_h = 0;
+ }
+
+ if(first_row<rows.size() && i==rows[first_row].first)
+ y = geom.h-min(geom.h, margin.top);
+
+ if(!y)
+ items[i]->set_visible(false);
+ else if(igeom.h+margin.bottom<=y)
{
- h -= ih;
- --max_scroll;
+ items[i]->set_visible(true);
+ unsigned iw = (view_mode==GRID ? igeom.w : view_w);
+ items[i]->set_geometry(Geometry(margin.left+x, y-igeom.h, iw, igeom.h));
}
+ else
+ {
+ for(size_t j=rows.back().first; j<=i; ++j)
+ items[j]->set_visible(false);
+ y = 0;
+ }
+
+ x += igeom.w;
+ row_h = max(row_h, igeom.h);
+ }
+
+ if(record_rows)
+ rows.back().height = row_h;
+}
+
+size_t List::last_to_first_row(size_t last) const
+{
+ if(!items_part)
+ return last;
+
+ const Sides &margin = items_part->get_margin();
+ unsigned view_h = geom.h-min(geom.h, margin.top+margin.bottom);
+
+ unsigned items_h = 0;
+ for(size_t i=last; i<rows.size(); --i)
+ {
+ items_h += rows[i].height;
+ if(items_h>view_h)
+ return min(i+1, last);
}
- if(first>max_scroll)
- first = max_scroll;
+ return 0;
+}
+
+size_t List::item_index_to_row(size_t index) const
+{
+ for(size_t i=0; i+1<rows.size(); ++i)
+ if(rows[i+1].first>index)
+ return i;
+ return rows.size()-1;
+}
+
+void List::check_view_range()
+{
+ if(!style)
+ return;
+
+ if(items.empty())
+ max_scroll = 0;
+ else
+ max_scroll = last_to_first_row(rows.size()-1);
+
+ if(first_row>max_scroll)
+ first_row = max_scroll;
slider.set_range(0, max_scroll);
- slider.set_value(max_scroll-first);
+ slider.set_page_size(rows.size()-max_scroll);
+ slider.set_value(max_scroll-first_row);
+}
+
+void List::scroll_to_focus()
+{
+ if(focus_index==INVALID_INDEX || items[focus_index]->is_visible())
+ return;
+
+ size_t focus_row = item_index_to_row(focus_index);
+ if(focus_row<first_row)
+ slider.set_value(max_scroll-focus_row);
+ else
+ slider.set_value(max_scroll-last_to_first_row(focus_row));
}
void List::slider_value_changed(double value)
{
if(max_scroll>0 && !ignore_slider_change)
{
- first = max_scroll-static_cast<unsigned>(value);
- rebuild();
+ first_row = max_scroll-static_cast<size_t>(value);
+ mark_rebuild();
}
}
+void List::adjust_index(size_t &index, size_t pos, ptrdiff_t change)
+{
+ if(index==INVALID_INDEX)
+ return;
+ else if(index>pos)
+ index += change;
+ else if(index==pos)
+ index = (change>0 ? index+change : INVALID_INDEX);
+}
+
List::DataObserver::DataObserver(List &l):
list(l)
list.data->signal_refresh_item.connect(sigc::mem_fun(this, &DataObserver::refresh_item));
}
-void List::DataObserver::item_added(unsigned i)
+void List::DataObserver::item_added(size_t i)
{
- if(list.sel_index>=static_cast<int>(i))
- ++list.sel_index;
+ adjust_index(list.sel_index, i, 1);
+ adjust_index(list.focus_index, i, 1);
- Item *item = list.create_item(i);
- list.items.insert(list.items.begin()+i, item);
+ list.items.insert(list.items.begin()+i, list.create_item(i));
list.items_changed();
}
-void List::DataObserver::item_removed(unsigned i)
+void List::DataObserver::item_removed(size_t i)
{
- if(list.sel_index>static_cast<int>(i))
- --list.sel_index;
- else if(list.sel_index==static_cast<int>(i))
- list.sel_index = -1;
+ bool had_selection = (list.sel_index!=INVALID_INDEX);
+ adjust_index(list.sel_index, i, -1);
+ adjust_index(list.focus_index, i, -1);
- delete list.items[i];
list.items.erase(list.items.begin()+i);
list.items_changed();
+
+ if(had_selection && list.sel_index==INVALID_INDEX)
+ list.signal_selection_cleared.emit();
}
void List::DataObserver::cleared()
{
- list.sel_index = -1;
- for(vector<Item *>::iterator i=list.items.begin(); i!=list.items.end(); ++i)
- delete *i;
+ list.sel_index = INVALID_INDEX;
+ list.focus_index = INVALID_INDEX;
list.items.clear();
list.items_changed();
+
+ list.signal_selection_cleared.emit();
}
-void List::DataObserver::refresh_item(unsigned i)
+void List::DataObserver::refresh_item(size_t i)
{
- delete list.items[i];
- // Avoid stale pointer while create_item is executing
- list.items[i] = 0;
+ // Destroy the old item before calling create_item
+ list.items[i].reset();
list.items[i] = list.create_item(i);
list.items_changed();
}
+List::Item::Item()
+{
+ input_type = INPUT_NAVIGATION;
+}
+
void List::Item::autosize_special(const Part &part, Geometry &ageom) const
{
if(part.get_name()=="children")
{
const Sides &margin = part.get_margin();
- for(list<Child *>::const_iterator i=children.begin(); i!=children.end(); ++i)
+ for(const unique_ptr<Child> &c: children)
{
Geometry cgeom;
- (*i)->widget->autosize(cgeom);
+ c->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);
}
{
if(part.get_name()=="children")
{
- for(list<Child *>::const_iterator i=children.begin(); i!=children.end(); ++i)
- (*i)->widget->render(renderer);
+ for(const unique_ptr<Child> &c: children)
+ c->widget->render(renderer);
+ }
+}
+
+
+void List::SimpleItem::on_style_change()
+{
+ if(!style || children.empty())
+ return;
+
+ Widget *child = children.front()->widget;
+ child->autosize();
+ if(const Part *part = style->find_part("children"))
+ {
+ const Sides &margin = part->get_margin();
+ child->set_position(margin.left, margin.bottom);
}
}
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)
+ size_t n = 0;
+ for(const unique_ptr<Child> &c: children)
{
Geometry cgeom;
- (*i)->widget->autosize(cgeom);
+ c->widget->autosize(cgeom);
// TODO invent a better way to specify spacings
widths[n] = max(widths[n], cgeom.w+8);
+ ++n;
}
}
if(!style)
return;
- const Part *part = style->get_part("children");
+ const Part *part = style->find_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)
+ size_t n = 0;
+ for(const unique_ptr<Child> &c: children)
{
- (*i)->widget->set_position(x, margin.bottom);
- x += widths[n];
+ c->widget->set_position(x, margin.bottom);
+ x += widths[n++];
}
}
if(!style)
return;
- for(std::list<Child *>::const_iterator i=children.begin(); i!=children.end(); ++i)
- (*i)->widget->autosize();
+ for(const unique_ptr<Child> &c: children)
+ c->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))
+ for(const unique_ptr<Item> &i: list->items)
+ if(i.get()!=this)
+ if(MultiColumnItem *mci = dynamic_cast<MultiColumnItem *>(i.get()))
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)
+ for(size_t 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))
+ for(const unique_ptr<Item> &i: list->items)
+ if(MultiColumnItem *mci = dynamic_cast<MultiColumnItem *>(i.get()))
mci->set_widths(self_widths);
}
- else
- set_widths(self_widths);
+
+ set_widths(self_widths);
}
add(label);
}
-void List::BasicItem::on_style_change()
-{
- if(!style)
- return;
-
- label.autosize();
- if(const Part *part = style->get_part("children"))
- {
- const Sides &margin = part->get_margin();
- label.set_position(margin.left, margin.bottom);
- }
-}
-
List::Loader::Loader(List &l):
DataFile::DerivedObjectLoader<List, Widget::Loader>(l)
{
add("item", &Loader::item);
- add("view_size", &List::view_size);
+ add("view_mode", &List::view_mode);
+ add("view_size", &List::view_rows);
+ add("view_size", &List::view_rows, &List::view_columns);
}
void List::Loader::item(const string &v)
dynamic_cast<BasicListData<string> &>(*obj.data).append(v);
}
+
+void operator>>(const LexicalConverter &conv, List::ViewMode &vm)
+{
+ const string &str = conv.get();
+ if(str=="LIST")
+ vm = List::LIST;
+ else if(str=="GRID")
+ vm = List::GRID;
+ else
+ throw lexical_error(format("conversion of '%s' to List::ViewMode", str));
+}
+
} // namespace GLtk
} // namespace Msp
projects / libs / gltk.git / blobdiff