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

diff --git a/source/list.cpp b/source/list.cpp
index 59d13dc..4b6854f 100644
--- a/source/list.cpp
+++ b/source/list.cpp
@@ -1,249 +1,727 @@
-/* $Id$
-
-This file is part of libmspgltk
-Copyright © 2007-2009  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
-#include <msp/gl/immediate.h>
+#include <msp/core/raii.h>
+#include <msp/debug/demangle.h>
 #include <msp/gl/matrix.h>
-#include <msp/gl/transform.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 "vslider.h"
+#include "text.h"
 
 using namespace std;
 
 namespace Msp {
 namespace GLtk {
 
-List::List(const Resources &r):
-	Widget(r),
-	Container(r),
-	sel_index(-1),
-	first(0),
-	n_visible(1),
-	row_height(1),
-	items_part(0),
-	slider(res)
+incompatible_data::incompatible_data(const type_info &ti):
+	logic_error("expected "+Debug::demangle(ti.name()))
+{ }
+
+
+List::List():
+	List(*new BasicListData<string>)
+{
+	own_data = true;
+}
+
+List::List(ListData &d):
+	data(&d),
+	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));
+}
 
-	update_style();
+List::~List()
+{
+	delete item_factory;
+	delete observer;
+	if(own_data)
+		delete data;
 }
 
-void List::append(const string &v)
+void List::autosize_special(const Part &part, Geometry &ageom) const
 {
-	items.push_back(v);
-	recalculate_parameters();
+	if(part.get_name()=="items")
+	{
+		const Sides &margin = part.get_margin();
+
+		unsigned items_w = 0;
+		unsigned items_h = 0;
+		for(size_t i=0; i<items.size(); ++i)
+		{
+			Geometry igeom;
+			items[i]->autosize(igeom);
+			items_w = max(items_w, igeom.w);
+			items_h = max(items_h, igeom.h);
+		}
+
+		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, 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);
 }
 
-void List::insert(unsigned i, const string &v)
+void List::set_data(ListData &d)
 {
-	if(i>items.size())
-		throw InvalidParameterValue("Index out of range");
+	if(item_factory)
+		item_factory->set_data(d);
+
+	delete observer;
+	if(own_data)
+		delete data;
 
-	items.insert(items.begin()+i, v);
-	recalculate_parameters();
+	data = &d;
+	own_data = false;
+	observer = new DataObserver(*this);
+
+	for(Item *i: items)
+		delete i;
+	items.clear();
+	size_t n_items = data->size();
+	for(size_t i=0; i<n_items; ++i)
+	{
+		Item *item = create_item(i);
+		items.push_back(item);
+	}
+
+	items_changed();
 }
 
-void List::remove(unsigned i)
+void List::items_changed()
 {
-	if(i>items.size())
-		throw InvalidParameterValue("Index out of range");
+	signal_autosize_changed.emit();
+	mark_rebuild();
+}
 
-	items.erase(items.begin()+i);
-	if(sel_index>static_cast<int>(i))
-		--sel_index;
-	else if(sel_index==static_cast<int>(i))
-		sel_index = -1;
+List::Item *List::create_item(size_t index)
+{
+	Item *item = nullptr;
+	if(item_factory)
+		item = item_factory->create_item(index);
+	else
+		item = new 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));
+	return item;
+}
 
-	recalculate_parameters();
+void List::set_view_size(unsigned s)
+{
+	set_view_size(s, s);
 }
 
-void List::clear()
+void List::set_view_size(unsigned r, unsigned c)
 {
-	items.clear();
-	sel_index = -1;
+	view_rows = r;
+	view_columns = c;
+	signal_autosize_changed.emit();
+}
 
-	recalculate_parameters();
+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<0)
-		sel_index = -1;
-	else if(i<static_cast<int>(items.size()))
+	if(i>=data->size() && i!=INVALID_INDEX)
+		throw out_of_range("List::set_selected_index");
+
+	if(i==sel_index)
+		return;
+
+	if(sel_index!=INVALID_INDEX)
+		items[sel_index]->set_active(false);
+
+	sel_index = i;
+	focus_index = i;
+	if(i==INVALID_INDEX)
 	{
-		sel_index = i;
-		signal_item_selected.emit(sel_index, items[sel_index]);
+		set_input_focus(nullptr);
+		signal_selection_cleared.emit();
 	}
 	else
-		throw InvalidParameterValue("Index out of range");
+	{
+		items[sel_index]->set_active(true);
+		if(state&FOCUS)
+			set_input_focus(items[focus_index]);
+		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])
+			return set_selected_index(i);
+}
+
+void List::rebuild_special(const Part &part)
+{
+	if(part.get_name()=="slider")
+		reposition_child(slider, part);
+	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();
+		if(first_row!=old_first_row || max_scroll!=old_max_scroll)
+			reposition_items(false);
+	}
+
+	Widget::rebuild_special(part);
+}
+
+void List::render_special(const Part &part, GL::Renderer &renderer) const
+{
+	if(part.get_name()=="items")
+	{
+		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);
 }
 
-const string &List::get_selected() const
+bool List::key_press(unsigned key, unsigned mod)
 {
-	if(sel_index<0)
-		throw InvalidState("No selection");
+	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 items[sel_index];
+	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
 	{
-		if(items_part)
-			y += items_part->get_margin().top;
+		Container::button_press(x, y, btn);
+		if(click_focus && btn==1)
+			set_selected_item(click_focus);
+	}
+}
 
-		unsigned i = (geom.h-1-y)/row_height;
-		if(i<n_visible && first+i<items.size())
+void List::touch_press(int x, int y, unsigned finger)
+{
+	if(finger==0)
+	{
+		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)
 		{
-			sel_index = first+i;
+			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;
+	}
+}
 
-			signal_item_selected.emit(sel_index, items[sel_index]);
+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)
+			{
+				drag_start_y -= row_h;
+				slider.set_value(max_scroll-(first_row-1));
+			}
 		}
 	}
 }
 
-void List::render_special(const Part &part) const
+void List::focus_in()
 {
-	if(part.get_name()=="items")
+	Container::focus_in();
+	if(focus_index!=INVALID_INDEX && items[focus_index]->is_visible())
+		set_input_focus(items[focus_index]);
+	else
 	{
-		const GL::Font &font = *style->get_font();
-		const float font_size = font.get_default_size();
-		const GL::Color &color = style->get_font_color();
-		const Sides &margin = part.get_margin();
+		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;
+}
 
-		Geometry pgeom = geom;
-		pgeom.h = row_height;
-		pgeom.w -= margin.left+margin.right;
+void List::on_style_change()
+{
+	items_part = (style ? style->find_part("items") : nullptr);
+}
 
-		for(unsigned i=0; (i<n_visible && first+i<items.size()); ++i)
+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]);
+	}
+}
+
+void List::item_autosize_changed(Item *item)
+{
+	item->autosize();
+	signal_autosize_changed.emit();
+	mark_rebuild();
+}
+
+void List::reposition_items(bool record_rows)
+{
+	if(!items_part)
+		return;
+
+	if(record_rows)
+	{
+		rows.clear();
+		rows.push_back(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)
+	{
+		const Geometry &igeom = items[i]->get_geometry();
+
+		if(view_mode!=GRID || (x>0 && x+igeom.w>view_w))
 		{
-			Geometry rgeom;
-			rgeom.w = static_cast<unsigned>(font.get_string_width(items[first+i])*font_size);
-			rgeom.h = row_height;
-			rgeom.x = margin.left;
-			rgeom.y = geom.h-margin.top-(i+1)*row_height-static_cast<int>(font.get_descent()*font_size);
-			part.get_alignment().apply(rgeom, pgeom);
-
-			GL::push_matrix();
-			GL::translate(rgeom.x, rgeom.y, 0);
-			GL::scale_uniform(font_size);
-			GL::Immediate imm((GL::COLOR4_UBYTE, GL::TEXCOORD2, GL::VERTEX2));
-			imm.color(color.r, color.g, color.b);
-			font.draw_string(items[first+i], imm);
-			GL::pop_matrix();
+			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)
+		{
+			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);
 	}
-	else if(part.get_name()=="selection")
+
+	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)
 	{
-		if(sel_index>=static_cast<int>(first) && sel_index<static_cast<int>(first+n_visible))
-		{
-			const Sides &margin = part.get_margin();
+		items_h += rows[i].height;
+		if(items_h>view_h)
+			return min(i+1, last);
+	}
 
-			Geometry pgeom = geom;
-			pgeom.h = row_height;
-			pgeom.w -= margin.left+margin.right;
+	return 0;
+}
 
-			Geometry rgeom = part.get_geometry();
-			rgeom.y += geom.h-margin.top-row_height*(sel_index-first+1);
-			rgeom.x += margin.left;
-			part.get_alignment().apply(rgeom, pgeom);
+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;
+}
 
-			GL::push_matrix();
-			GL::translate(rgeom.x, rgeom.y, 0);
-			part.get_graphic(state)->render(rgeom.w, rgeom.h);
-			GL::pop_matrix();
-		}
+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_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_row = max_scroll-static_cast<size_t>(value);
+		mark_rebuild();
 	}
-	else if(part.get_name()=="slider")
-		slider.render();
 }
 
-void List::on_geometry_change()
+void List::adjust_index(size_t &index, size_t pos, ptrdiff_t change)
 {
-	reposition_slider();
+	if(index==INVALID_INDEX)
+		return;
+	else if(index>pos)
+		index += change;
+	else if(index==pos)
+		index = (change>0 ? index+change : INVALID_INDEX);
+}
+
 
-	recalculate_parameters();
+List::DataObserver::DataObserver(List &l):
+	list(l)
+{
+	list.data->signal_item_added.connect(sigc::mem_fun(this, &DataObserver::item_added));
+	list.data->signal_item_removed.connect(sigc::mem_fun(this, &DataObserver::item_removed));
+	list.data->signal_cleared.connect(sigc::mem_fun(this, &DataObserver::cleared));
+	list.data->signal_refresh_item.connect(sigc::mem_fun(this, &DataObserver::refresh_item));
 }
 
-void List::on_style_change()
+void List::DataObserver::item_added(size_t i)
+{
+	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_changed();
+}
+
+void List::DataObserver::item_removed(size_t i)
+{
+	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()
 {
-	reposition_slider();
+	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(size_t i)
+{
+	delete list.items[i];
+	// Avoid stale pointer while create_item is executing
+	list.items[i] = nullptr;
+	list.items[i] = list.create_item(i);
+	list.items_changed();
+}
 
-	items_part = style->get_part("items");
 
-	const GL::Font &font = *style->get_font();
-	row_height = static_cast<unsigned>((font.get_ascent()-font.get_descent())*font.get_default_size());
+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(const Child *c: children)
+		{
+			Geometry 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);
+		}
+	}
+}
 
-	recalculate_parameters();
+void List::Item::set_active(bool a)
+{
+	set_state(ACTIVE, (a ? ACTIVE : NORMAL));
 }
 
-void List::reposition_slider()
+void List::Item::render_special(const Part &part, GL::Renderer &renderer) const
 {
-	if(const Part *slider_part = style->get_part("slider"))
+	if(part.get_name()=="children")
 	{
-		Geometry sgeom = slider_part->get_geometry();
-		slider_part->get_alignment().apply(sgeom, geom, slider_part->get_margin());
-		slider.set_geometry(sgeom);
+		for(const Child *c: children)
+			c->widget->render(renderer);
 	}
 }
 
-void List::recalculate_parameters()
+
+void List::SimpleItem::on_style_change()
 {
-	unsigned h = geom.h;
-	if(items_part)
+	if(!style || children.empty())
+		return;
+
+	Widget *child = children.front()->widget;
+	child->autosize();
+	if(const Part *part = style->find_part("children"))
 	{
-		const Sides &margin = items_part->get_margin();
-		h -= margin.top+margin.bottom;
+		const Sides &margin = part->get_margin();
+		child->set_position(margin.left, margin.bottom);
 	}
+}
 
-	n_visible = h/row_height;
 
-	if(first+n_visible>items.size())
+void List::MultiColumnItem::check_widths(vector<unsigned> &widths) const
+{
+	if(widths.size()<children.size())
+		widths.resize(children.size(), 0);
+
+	size_t n = 0;
+	for(const Child *c: children)
 	{
-		if(items.size()>n_visible)
-			first = items.size()-n_visible;
-		else
-			first = 0;
+		Geometry cgeom;
+		c->widget->autosize(cgeom);
+		// TODO invent a better way to specify spacings
+		widths[n] = max(widths[n], cgeom.w+8);
+		++n;
 	}
+}
+
+void List::MultiColumnItem::set_widths(const vector<unsigned> &widths)
+{
+	if(!style)
+		return;
 
-	if(items.size()>n_visible)
+	const Part *part = style->find_part("children");
+	if(!part)
+		return;
+
+	const Sides &margin = part->get_margin();
+	int x = margin.left;
+	size_t n = 0;
+	for(const Child *c: children)
 	{
-		slider.set_range(0, items.size()-n_visible);
-		slider.set_value(items.size()-n_visible-first);
+		c->widget->set_position(x, margin.bottom);
+		x += widths[n++];
 	}
-	else
+}
+
+void List::MultiColumnItem::on_style_change()
+{
+	if(!style)
+		return;
+
+	for(const Child *c: children)
+		c->widget->autosize();
+
+	vector<unsigned> widths;
+	List *list = static_cast<List *>(parent);
+	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(size_t i=0; (!update_all && i<widths.size() && i<self_widths.size()); ++i)
+		update_all = self_widths[i]>widths[i];
+
+	if(update_all)
 	{
-		slider.set_range(0, 0);
-		slider.set_value(0);
+		for(Item *i: list->items)
+			if(MultiColumnItem *mci = dynamic_cast<MultiColumnItem *>(i))
+				mci->set_widths(self_widths);
 	}
+
+	set_widths(self_widths);
 }
 
-void List::slider_value_changed(double value)
+
+List::BasicItem::BasicItem(const string &text):
+	label(text)
 {
-	if(items.size()>n_visible)
-		first = items.size()-n_visible-static_cast<unsigned>(value);
+	add(label);
 }
 
 
 List::Loader::Loader(List &l):
-	Widget::Loader(l)
+	DataFile::DerivedObjectLoader<List, Widget::Loader>(l)
 {
 	add("item", &Loader::item);
+	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<List &>(wdg).append(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