X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flist.cpp;h=4b6854f72a91fd5cf1785af6adf2a76b70dc1b25;hb=aa9b8db38efb9e97460c76e27cecc4d1591b23e5;hp=9eff09bb47566a1a6785ee909327da878f8a29ce;hpb=21cb1e0b6fcc653d1298423dff5af5609389d415;p=libs%2Fgltk.git

diff --git a/source/list.cpp b/source/list.cpp
index 9eff09b..4b6854f 100644
--- a/source/list.cpp
+++ b/source/list.cpp
@@ -9,7 +9,6 @@
 #include "part.h"
 #include "style.h"
 #include "text.h"
-#include "vslider.h"
 
 using namespace std;
 
@@ -22,39 +21,17 @@ incompatible_data::incompatible_data(const type_info &ti):
 
 
 List::List():
-	data(new BasicListData<string>),
-	own_data(true)
+	List(*new BasicListData<string>)
 {
-	init();
+	own_data = true;
 }
 
 List::List(ListData &d):
 	data(&d),
-	own_data(false)
-{
-	init();
-}
-
-void List::init()
+	observer(new DataObserver(*this))
 {
 	input_type = INPUT_NAVIGATION;
 
-	item_factory = 0;
-	view_mode = LIST;
-	sel_index = -1;
-	focus_index = -1;
-	first_row = 0;
-	max_scroll = 0;
-	view_rows = 5;
-	view_columns = 5;
-	items_part = 0;
-	ignore_slider_change = false;
-	dragging = false;
-	drag_start_x = 0;
-	drag_start_y = 0;
-
-	observer = new DataObserver(*this);
-
 	add(slider);
 	slider.set_step(1);
 	slider.signal_value_changed.connect(sigc::mem_fun(this, &List::slider_value_changed));
@@ -76,7 +53,7 @@ void List::autosize_special(const Part &part, Geometry &ageom) const
 
 		unsigned items_w = 0;
 		unsigned items_h = 0;
-		for(unsigned i=0; i<items.size(); ++i)
+		for(size_t i=0; i<items.size(); ++i)
 		{
 			Geometry igeom;
 			items[i]->autosize(igeom);
@@ -120,11 +97,11 @@ void List::set_data(ListData &d)
 	own_data = false;
 	observer = new DataObserver(*this);
 
-	for(vector<Item *>::iterator i=items.begin(); i!=items.end(); ++i)
-		delete *i;
+	for(Item *i: items)
+		delete i;
 	items.clear();
-	unsigned n_items = data->size();
-	for(unsigned i=0; i<n_items; ++i)
+	size_t n_items = data->size();
+	for(size_t i=0; i<n_items; ++i)
 	{
 		Item *item = create_item(i);
 		items.push_back(item);
@@ -136,17 +113,17 @@ void List::set_data(ListData &d)
 void List::items_changed()
 {
 	signal_autosize_changed.emit();
-	rebuild();
+	mark_rebuild();
 }
 
-List::Item *List::create_item(unsigned index)
+List::Item *List::create_item(size_t index)
 {
-	Item *item = 0;
+	Item *item = nullptr;
 	if(item_factory)
 		item = item_factory->create_item(index);
 	else
 		item = new BasicItem(data->get_string(index));
-	if(static_cast<int>(index)==sel_index)
+	if(index==sel_index)
 		item->set_active(true);
 	add(*item);
 	item->autosize();
@@ -171,27 +148,26 @@ void List::set_view_all()
 	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 || (i<0 && sel_index<0))
+	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 = i;
+	focus_index = i;
+	if(i==INVALID_INDEX)
 	{
-		sel_index = -1;
-		focus_index = -1;
-		set_input_focus(0);
+		set_input_focus(nullptr);
 		signal_selection_cleared.emit();
 	}
 	else
 	{
-		sel_index = i;
-		focus_index = i;
 		items[sel_index]->set_active(true);
 		if(state&FOCUS)
 			set_input_focus(items[focus_index]);
@@ -201,7 +177,7 @@ void List::set_selected_index(int i)
 
 void List::set_selected_item(Widget *item)
 {
-	for(unsigned i=rows[first_row].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)
 		if(item==items[i])
 			return set_selected_index(i);
 }
@@ -214,8 +190,8 @@ void List::rebuild_special(const Part &part)
 	{
 		SetFlag flag(ignore_slider_change);
 		reposition_items(true);
-		unsigned old_first_row = first_row;
-		unsigned old_max_scroll = max_scroll;
+		size_t old_first_row = first_row;
+		size_t old_max_scroll = max_scroll;
 		check_view_range();
 		if(first_row!=old_first_row || max_scroll!=old_max_scroll)
 			reposition_items(false);
@@ -228,7 +204,7 @@ void List::render_special(const Part &part, GL::Renderer &renderer) const
 {
 	if(part.get_name()=="items")
 	{
-		for(unsigned i=rows[first_row].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")
@@ -251,7 +227,7 @@ void List::button_press(int x, int y, unsigned btn)
 {
 	if(btn==4 || btn==5)
 	{
-		unsigned change = 3;
+		size_t change = 3;
 		if(btn==4)
 		{
 			change = min(first_row, change);
@@ -328,11 +304,11 @@ void List::touch_motion(int, int y, unsigned finger)
 void List::focus_in()
 {
 	Container::focus_in();
-	if(focus_index>=0 && items[focus_index]->is_visible())
+	if(focus_index!=INVALID_INDEX && items[focus_index]->is_visible())
 		set_input_focus(items[focus_index]);
 	else
 	{
-		if(sel_index>=0 && items[sel_index]->is_visible())
+		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);
@@ -353,14 +329,14 @@ bool List::navigate(Navigation nav)
 
 void List::on_style_change()
 {
-	items_part = (style ? style->get_part("items") : 0);
+	items_part = (style ? style->find_part("items") : nullptr);
 }
 
 void List::move_focus(Navigation nav, bool select)
 {
 	if(nav==NAV_UP && view_mode==GRID)
 	{
-		unsigned row = item_index_to_row(focus_index);
+		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
@@ -368,7 +344,7 @@ void List::move_focus(Navigation nav, bool select)
 	}
 	else if(nav==NAV_DOWN && view_mode==GRID)
 	{
-		unsigned row = item_index_to_row(focus_index);
+		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
@@ -381,7 +357,7 @@ void List::move_focus(Navigation nav, bool select)
 	}
 	else if(nav==NAV_DOWN || (nav==NAV_RIGHT && view_mode==GRID))
 	{
-		if(static_cast<unsigned>(focus_index+1)<items.size())
+		if(focus_index+1<items.size())
 			set_focus_index(focus_index+1);
 	}
 
@@ -389,10 +365,10 @@ void List::move_focus(Navigation nav, bool select)
 		set_selected_index(focus_index);
 }
 
-void List::set_focus_index(int i)
+void List::set_focus_index(size_t i)
 {
 	focus_index = i;
-	if(focus_index>=0)
+	if(focus_index!=INVALID_INDEX)
 	{
 		scroll_to_focus();
 		if(state&FOCUS)
@@ -404,7 +380,7 @@ void List::item_autosize_changed(Item *item)
 {
 	item->autosize();
 	signal_autosize_changed.emit();
-	rebuild();
+	mark_rebuild();
 }
 
 void List::reposition_items(bool record_rows)
@@ -423,7 +399,7 @@ void List::reposition_items(bool record_rows)
 	unsigned x = 0;
 	unsigned y = 0;
 	unsigned row_h = 0;
-	for(unsigned i=0; i<items.size(); ++i)
+	for(size_t i=0; i<items.size(); ++i)
 	{
 		const Geometry &igeom = items[i]->get_geometry();
 
@@ -453,7 +429,7 @@ void List::reposition_items(bool record_rows)
 		}
 		else
 		{
-			for(unsigned j=rows.back().first; j<=i; ++j)
+			for(size_t j=rows.back().first; j<=i; ++j)
 				items[j]->set_visible(false);
 			y = 0;
 		}
@@ -466,7 +442,7 @@ void List::reposition_items(bool record_rows)
 		rows.back().height = row_h;
 }
 
-unsigned List::last_to_first_row(unsigned last) const
+size_t List::last_to_first_row(size_t last) const
 {
 	if(!items_part)
 		return last;
@@ -475,7 +451,7 @@ unsigned List::last_to_first_row(unsigned last) const
 	unsigned view_h = geom.h-min(geom.h, margin.top+margin.bottom);
 
 	unsigned items_h = 0;
-	for(unsigned i=last; i<rows.size(); --i)
+	for(size_t i=last; i<rows.size(); --i)
 	{
 		items_h += rows[i].height;
 		if(items_h>view_h)
@@ -485,9 +461,9 @@ unsigned List::last_to_first_row(unsigned last) const
 	return 0;
 }
 
-unsigned List::item_index_to_row(unsigned index) const
+size_t List::item_index_to_row(size_t index) const
 {
-	for(unsigned i=0; i+1<rows.size(); ++i)
+	for(size_t i=0; i+1<rows.size(); ++i)
 		if(rows[i+1].first>index)
 			return i;
 	return rows.size()-1;
@@ -507,15 +483,16 @@ void List::check_view_range()
 		first_row = max_scroll;
 
 	slider.set_range(0, max_scroll);
+	slider.set_page_size(rows.size()-max_scroll);
 	slider.set_value(max_scroll-first_row);
 }
 
 void List::scroll_to_focus()
 {
-	if(focus_index<0 || items[focus_index]->is_visible())
+	if(focus_index==INVALID_INDEX || items[focus_index]->is_visible())
 		return;
 
-	unsigned focus_row = item_index_to_row(static_cast<unsigned>(focus_index));
+	size_t focus_row = item_index_to_row(focus_index);
 	if(focus_row<first_row)
 		slider.set_value(max_scroll-focus_row);
 	else
@@ -526,17 +503,19 @@ void List::slider_value_changed(double value)
 {
 	if(max_scroll>0 && !ignore_slider_change)
 	{
-		first_row = max_scroll-static_cast<unsigned>(value);
-		rebuild();
+		first_row = max_scroll-static_cast<size_t>(value);
+		mark_rebuild();
 	}
 }
 
-void List::adjust_index(int &index, int pos, int change)
+void List::adjust_index(size_t &index, size_t pos, ptrdiff_t change)
 {
-	if(index>pos)
+	if(index==INVALID_INDEX)
+		return;
+	else if(index>pos)
 		index += change;
 	else if(index==pos)
-		index = (change>0 ? index+change : -1);
+		index = (change>0 ? index+change : INVALID_INDEX);
 }
 
 
@@ -549,7 +528,7 @@ List::DataObserver::DataObserver(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)
 {
 	adjust_index(list.sel_index, i, 1);
 	adjust_index(list.focus_index, i, 1);
@@ -559,9 +538,9 @@ void List::DataObserver::item_added(unsigned i)
 	list.items_changed();
 }
 
-void List::DataObserver::item_removed(unsigned i)
+void List::DataObserver::item_removed(size_t i)
 {
-	bool had_selection = (list.sel_index>=0);
+	bool had_selection = (list.sel_index!=INVALID_INDEX);
 	adjust_index(list.sel_index, i, -1);
 	adjust_index(list.focus_index, i, -1);
 
@@ -569,27 +548,27 @@ void List::DataObserver::item_removed(unsigned i)
 	list.items.erase(list.items.begin()+i);
 	list.items_changed();
 
-	if(had_selection && list.sel_index<0)
+	if(had_selection && list.sel_index==INVALID_INDEX)
 		list.signal_selection_cleared.emit();
 }
 
 void List::DataObserver::cleared()
 {
-	list.sel_index = -1;
-	list.focus_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;
+	for(Item *i: list.items)
+		delete i;
 	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;
+	list.items[i] = nullptr;
 	list.items[i] = list.create_item(i);
 	list.items_changed();
 }
@@ -605,10 +584,10 @@ 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 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);
 		}
@@ -624,8 +603,8 @@ void List::Item::render_special(const Part &part, GL::Renderer &renderer) const
 {
 	if(part.get_name()=="children")
 	{
-		for(list<Child *>::const_iterator i=children.begin(); i!=children.end(); ++i)
-			(*i)->widget->render(renderer);
+		for(const Child *c: children)
+			c->widget->render(renderer);
 	}
 }
 
@@ -637,7 +616,7 @@ void List::SimpleItem::on_style_change()
 
 	Widget *child = children.front()->widget;
 	child->autosize();
-	if(const Part *part = style->get_part("children"))
+	if(const Part *part = style->find_part("children"))
 	{
 		const Sides &margin = part->get_margin();
 		child->set_position(margin.left, margin.bottom);
@@ -650,13 +629,14 @@ void List::MultiColumnItem::check_widths(vector<unsigned> &widths) const
 	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 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;
 	}
 }
 
@@ -665,17 +645,17 @@ void List::MultiColumnItem::set_widths(const vector<unsigned> &widths)
 	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 Child *c: children)
 	{
-		(*i)->widget->set_position(x, margin.bottom);
-		x += widths[n];
+		c->widget->set_position(x, margin.bottom);
+		x += widths[n++];
 	}
 }
 
@@ -684,26 +664,26 @@ void List::MultiColumnItem::on_style_change()
 	if(!style)
 		return;
 
-	for(std::list<Child *>::const_iterator i=children.begin(); i!=children.end(); ++i)
-		(*i)->widget->autosize();
+	for(const 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(Item *i: list->items)
+		if(i!=this)
+			if(MultiColumnItem *mci = dynamic_cast<MultiColumnItem *>(i))
 				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(Item *i: list->items)
+			if(MultiColumnItem *mci = dynamic_cast<MultiColumnItem *>(i))
 				mci->set_widths(self_widths);
 	}