X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flist.cpp;h=924cfb55d37b68f99e2091c844db7e91aafd6b90;hb=3db68f2604b657e79f1b2b317c19c41c2d5a985b;hp=4f8b27c649a909ddd8fabd7ce7c7db1f273d2c30;hpb=95210598ff214bbc8d05657aeffc4ce7801f211a;p=libs%2Fgltk.git

diff --git a/source/list.cpp b/source/list.cpp
index 4f8b27c..924cfb5 100644
--- a/source/list.cpp
+++ b/source/list.cpp
@@ -5,6 +5,7 @@ Copyright © 2007  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
+#include <msp/gl/immediate.h>
 #include <msp/gl/matrix.h>
 #include <msp/gl/transform.h>
 #include "graphic.h"
@@ -71,6 +72,21 @@ void List::clear()
 {
 	items.clear();
 	sel_index=-1;
+
+	recalculate_parameters();
+}
+
+void List::set_selected_index(int i)
+{
+	if(i<0)
+		sel_index=-1;
+	else if(i<static_cast<int>(items.size()))
+	{
+		sel_index=i;
+		signal_item_selected.emit(sel_index, items[sel_index]);
+	}
+	else
+		throw InvalidParameterValue("Index out of range");
 }
 
 const string &List::get_selected() const
@@ -92,13 +108,13 @@ void List::button_press(int x, int y, unsigned btn)
 	else if(btn==1)
 	{
 		const GL::Font *const font=style->get_font();
-		const unsigned row_height=static_cast<unsigned>(font->get_default_size());
+		const unsigned row_height=static_cast<unsigned>((font->get_ascent()-font->get_descent())*font->get_default_size());
 
 		if(items_part)
 			y+=items_part->get_margin().top;
 
 		unsigned i=(geom.h-1-y)/row_height;
-		if(i<n_visible)
+		if(i<n_visible && first+i<items.size())
 		{
 			sel_index=first+i;
 
@@ -132,24 +148,29 @@ void List::render_special(const Part &part) const
 	{
 		const GL::Font *const font=style->get_font();
 		const float font_size=font->get_default_size();
-		const unsigned row_height=static_cast<unsigned>(font_size);
+		const GL::Color &color=style->get_font_color();
+		const unsigned row_height=static_cast<unsigned>((font->get_ascent()-font->get_descent())*font_size);
 		const Sides &margin=part.get_margin();
 
 		Geometry pgeom=geom;
 		pgeom.h=row_height;
+		pgeom.w-=margin.left+margin.right;
 
 		for(unsigned i=0; (i<n_visible && first+i<items.size()); ++i)
 		{
 			Geometry rgeom;
 			rgeom.w=static_cast<unsigned>(font->get_string_width(items[first+i])*font_size);
 			rgeom.h=static_cast<unsigned>((font->get_ascent()-font->get_descent())*font_size);
+			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);
-			font->draw_string(items[first+i]);
+			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();
 		}
 	}
@@ -159,7 +180,7 @@ void List::render_special(const Part &part) const
 		{
 			const GL::Font *const font=style->get_font();
 			const float font_size=font->get_default_size();
-			const unsigned row_height=static_cast<unsigned>(font_size);
+			const unsigned row_height=static_cast<unsigned>((font->get_ascent()-font->get_descent())*font_size);
 			const Sides &margin=part.get_margin();
 
 			Geometry pgeom=geom;
@@ -247,7 +268,8 @@ void List::recalculate_parameters()
 
 void List::slider_value_changed(double value)
 {
-	first=items.size()-n_visible-static_cast<unsigned>(value);
+	if(items.size()>n_visible)
+		first=items.size()-n_visible-static_cast<unsigned>(value);
 }