X-Git-Url: http://git.tdb.fi/?p=libs%2Fgltk.git;a=blobdiff_plain;f=source%2Flist.cpp;h=c74af90d4541cb2185f2afc1f0d7a1bff8f6c172;hp=e1f39b7dc8ecaa67db27c9212ada54ef24199593;hb=c8291177b545ec81930603a5915234a60296db51;hpb=11d1b67a9180a0e468b56e355fbe0c88d104ef72

diff --git a/source/list.cpp b/source/list.cpp
index e1f39b7..c74af90 100644
--- a/source/list.cpp
+++ b/source/list.cpp
@@ -1,6 +1,5 @@
-#include <msp/gl/immediate.h>
 #include <msp/gl/matrix.h>
-#include <msp/gl/transform.h>
+#include <msp/gl/meshbuilder.h>
 #include "graphic.h"
 #include "list.h"
 #include "part.h"
@@ -14,198 +13,155 @@ namespace Msp {
 namespace GLtk {
 
 List::List():
-	sel_index(-1),
-	first(0),
-	n_visible(1),
-	row_height(1),
-	items_part(0)
+	data(new BasicListData<string>),
+	own_data(true)
 {
+	init();
+}
+
+List::List(ListData &d):
+	data(&d),
+	own_data(false)
+{
+	init();
+}
+
+void List::init()
+{
+	sel_index = -1;
+	first = 0;
+	max_scroll = 0;
+	view_size = 5;
+
+	observer = new DataObserver(*this);
+
 	add(slider);
 	slider.set_step(1);
 	slider.signal_value_changed.connect(sigc::mem_fun(this, &List::slider_value_changed));
 }
 
-void List::autosize()
+List::~List()
 {
-	autosize_rows(5);
+	delete observer;
+	if(own_data)
+		delete data;
 }
 
-void List::autosize_rows(unsigned n)
+void List::autosize()
 {
 	if(!style)
 		return;
 
 	Widget::autosize();
 
-	if(items_part)
+	if(const Part *items_part = style->get_part("items"))
 	{
 		const Sides &margin = items_part->get_margin();
-		float font_size = style->get_font_size();
 
 		unsigned max_w = 0;
-		for(vector<string>::iterator i=items.begin(); i!=items.end(); ++i)
-		{
-			unsigned w = static_cast<unsigned>(style->get_font()->get_string_width(*i)*font_size);
-			max_w = max(max_w, w);
-		}
-
-		geom.w = max(geom.w, max_w+margin.left+margin.right);
-		geom.h = max(geom.h, n*row_height+margin.top+margin.bottom);
-	}
-
-	if(const Part *slider_part = style->get_part("slider"))
-	{
-		Geometry sgeom = slider_part->get_geometry();
-		if(!sgeom.w || !sgeom.h)
+		unsigned total_h = 0;
+		for(unsigned i=0; i<items.size(); ++i)
 		{
-			slider.autosize();
-			if(!sgeom.w)
-				sgeom.w = slider.get_geometry().w;
-			if(!sgeom.h)
-				sgeom.h = slider.get_geometry().h;
+			items[i]->autosize();
+			const Geometry &igeom = items[i]->get_geometry();
+			max_w = max(max_w, igeom.w);
+			if(view_size==0 || i<view_size)
+				total_h += igeom.h;
 		}
 
-		const Sides &margin = slider_part->get_margin();
-		geom.w = max(geom.w, sgeom.w+margin.left+margin.right);
-		geom.h = max(geom.h, sgeom.h+margin.top+margin.bottom);
+		if(!items.empty() && items.size()<view_size)
+			total_h = total_h*view_size/items.size();
 
-		reposition_slider();
+		geom.w = max(geom.w, max_w+margin.left+margin.right);
+		geom.h = max(geom.h, total_h+margin.top+margin.bottom);
 	}
 
 	check_view_range();
+	rebuild();
 }
 
-void List::autosize_all()
+void List::set_data(ListData &d)
 {
-	autosize_rows(items.size());
+	delete observer;
+	if(own_data)
+		delete data;
+
+	data = &d;
+	own_data = false;
+	observer = new DataObserver(*this);
+
+	items_changed();
 }
 
-void List::append(const string &v)
+void List::items_changed()
 {
-	items.push_back(v);
 	check_view_range();
 	signal_autosize_changed.emit();
+	reposition_items();
 }
 
-void List::insert(unsigned i, const string &v)
+List::Item *List::create_item(unsigned index)
 {
-	if(i>items.size())
-		throw out_of_range("List::insert");
-
-	items.insert(items.begin()+i, v);
-	check_view_range();
-	signal_autosize_changed.emit();
+	return new BasicItem(data->get_string(index));
 }
 
-void List::remove(unsigned i)
+void List::set_view_size(unsigned s)
 {
-	if(i>items.size())
-		throw out_of_range("List::remove");
-
-	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;
-
-	check_view_range();
+	view_size = s;
 	signal_autosize_changed.emit();
 }
 
-void List::clear()
+void List::set_view_all()
 {
-	items.clear();
-	sel_index = -1;
-
-	check_view_range();
-	signal_autosize_changed.emit();
+	set_view_size(0);
 }
 
 void List::set_selected_index(int i)
 {
+	if(i>static_cast<int>(data->size()))
+		throw out_of_range("List::set_selected_index");
+
+	if(sel_index>=0)
+		items[sel_index]->set_active(false);
 	if(i<0)
 		sel_index = -1;
-	else if(i<static_cast<int>(items.size()))
+	else
 	{
 		sel_index = i;
-		signal_item_selected.emit(sel_index, items[sel_index]);
+		items[sel_index]->set_active(true);
+		signal_item_selected.emit(sel_index);
 	}
-	else
-		throw out_of_range("List::set_selected_index");
-}
-
-const string &List::get_selected() const
-{
-	if(sel_index<0)
-		throw logic_error("sel_index<0");
-
-	return items[sel_index];
 }
 
-void List::render_special(const Part &part) const
+void List::render_special(const Part &part, GL::Renderer &renderer) const
 {
 	if(part.get_name()=="items")
 	{
-		const Sides &margin = part.get_margin();
-		Geometry pgeom = geom;
-		pgeom.h = row_height+margin.top+margin.bottom;
-
-		GL::PushMatrix push_mtx;
-		GL::translate(0, geom.h-pgeom.h, 0);
-
-		for(unsigned i=0; (i<n_visible && first+i<items.size()); ++i)
-		{
-			if(i!=0)
-				GL::translate(0, -static_cast<int>(row_height), 0);
-			Text(*style, items[first+i]).render(part, pgeom);
-		}
-	}
-	else if(part.get_name()=="selection")
-	{
-		if(sel_index>=static_cast<int>(first) && sel_index<static_cast<int>(first+n_visible))
-		{
-			const Sides &margin = part.get_margin();
-
-			Geometry pgeom = geom;
-			pgeom.h = row_height;
-			pgeom.w -= margin.left+margin.right;
-
-			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);
-
-			GL::push_matrix();
-			GL::translate(rgeom.x, rgeom.y, 0);
-			part.get_graphic(state)->render(rgeom.w, rgeom.h);
-			GL::pop_matrix();
-		}
+		for(unsigned i=first; (i<items.size() && items[i]->is_visible()); ++i)
+			items[i]->render(renderer);
 	}
 	else if(part.get_name()=="slider")
-		slider.render();
+		slider.render(renderer);
 }
 
 void List::button_press(int x, int y, unsigned btn)
 {
 	Container::button_press(x, y, btn);
-	if(!click_focus && btn==1)
+	if(click_focus && btn==1)
 	{
-		if(items_part)
-			y += items_part->get_margin().top;
-
-		unsigned i = (geom.h-1-y)/row_height;
-		if(i<n_visible && first+i<items.size())
-		{
-			sel_index = first+i;
-
-			signal_item_selected.emit(sel_index, items[sel_index]);
-		}
+		for(unsigned i=first; (i<items.size() && items[i]->is_visible()); ++i)
+			if(click_focus==items[i])
+			{
+				set_selected_index(i);
+				break;
+			}
 	}
 }
 
 void List::on_geometry_change()
 {
 	reposition_slider();
+	reposition_items();
 
 	check_view_range();
 }
@@ -213,17 +169,10 @@ void List::on_geometry_change()
 void List::on_style_change()
 {
 	if(!style)
-	{
-		items_part = 0;
 		return;
-	}
 
 	reposition_slider();
-
-	items_part = style->get_part("items");
-
-	const GL::Font &font = *style->get_font();
-	row_height = static_cast<unsigned>((font.get_ascent()-font.get_descent())*style->get_font_size());
+	reposition_items();
 
 	check_view_range();
 }
@@ -241,53 +190,189 @@ void List::reposition_slider()
 	}
 }
 
+void List::reposition_items()
+{
+	if(!style)
+		return;
+
+	if(const Part *items_part = style->get_part("items"))
+	{
+		const Sides &margin = items_part->get_margin();
+		unsigned w = geom.w-margin.left-margin.right;
+		unsigned y = 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;
+				}
+			}
+		}
+	}
+}
+
 void List::check_view_range()
 {
+	if(!style)
+		return;
+
 	unsigned h = geom.h;
-	if(items_part)
+	if(const Part *items_part = style->get_part("items"))
 	{
 		const Sides &margin = items_part->get_margin();
 		h -= margin.top+margin.bottom;
 	}
 
-	n_visible = h/row_height;
+	max_scroll = items.size();
+	for(unsigned i=items.size(); i-->0; )
+	{
+		unsigned ih = items[i]->get_geometry().h;
+		if(ih<=h)
+		{
+			h -= ih;
+			--max_scroll;
+		}
+	}
+
+	if(first>max_scroll)
+		first = max_scroll;
+
+	slider.set_range(0, max_scroll);
+	slider.set_value(max_scroll-first);
+}
 
-	if(first+n_visible>items.size())
+void List::slider_value_changed(double value)
+{
+	if(max_scroll>0)
 	{
-		if(items.size()>n_visible)
-			first = items.size()-n_visible;
-		else
-			first = 0;
+		first = max_scroll-static_cast<unsigned>(value);
+		reposition_items();
 	}
+}
+
 
-	if(items.size()>n_visible)
+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_strings.connect(sigc::mem_fun(this, &DataObserver::refresh_strings));
+}
+
+void List::DataObserver::item_added(unsigned i)
+{
+	if(list.sel_index>=static_cast<int>(i))
+		++list.sel_index;
+
+	Item *item = list.create_item(i);
+	list.add(*item);
+	list.items.insert(list.items.begin()+i, item);
+	list.items_changed();
+}
+
+void List::DataObserver::item_removed(unsigned 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;
+
+	delete list.items[i];
+	list.items.erase(list.items.begin()+i);
+	list.items_changed();
+}
+
+void List::DataObserver::cleared()
+{
+	list.sel_index = -1;
+	for(vector<Item *>::iterator i=list.items.begin(); i!=list.items.end(); ++i)
+		delete *i;
+	list.items.clear();
+	list.items_changed();
+}
+
+void List::DataObserver::refresh_strings()
+{
+	list.items_changed();
+}
+
+
+void List::Item::autosize()
+{
+	Widget::autosize();
+
+	if(const Part *part = style->get_part("children"))
 	{
-		slider.set_range(0, items.size()-n_visible);
-		slider.set_value(items.size()-n_visible-first);
+		const Sides &margin = part->get_margin();
+		for(list<Child *>::const_iterator i=children.begin(); i!=children.end(); ++i)
+		{
+			const Geometry &cgeom = (*i)->widget->get_geometry();
+			geom.w = max(geom.w, cgeom.x+cgeom.w+margin.right);
+			geom.h = max(geom.h, cgeom.y+cgeom.h+margin.top);
+		}
 	}
-	else
+}
+
+void List::Item::set_active(bool a)
+{
+	set_state(ACTIVE, (a ? ACTIVE : NORMAL));
+}
+
+void List::Item::render_special(const Part &part, GL::Renderer &renderer) const
+{
+	if(part.get_name()=="children")
 	{
-		slider.set_range(0, 0);
-		slider.set_value(0);
+		for(list<Child *>::const_iterator i=children.begin(); i!=children.end(); ++i)
+			(*i)->widget->render(renderer);
 	}
 }
 
-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);
+}
+
+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):
-	Widget::Loader(l)
+	DataFile::DerivedObjectLoader<List, Widget::Loader>(l)
 {
 	add("item", &Loader::item);
 }
 
 void List::Loader::item(const string &v)
 {
-	dynamic_cast<List &>(obj).append(v);
+	dynamic_cast<BasicListData<string> &>(*obj.data).append(v);
 }
 
 } // namespace GLtk