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

diff --git a/source/list.cpp b/source/list.cpp
index 924cfb5..cc9f707 100644
--- a/source/list.cpp
+++ b/source/list.cpp
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of libmspgltk
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
+Copyright © 2007-2009  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
@@ -21,24 +21,21 @@ 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(new VSlider(res)),
-	slider_active(false)
+	slider(res)
 {
-	slider->set_step(1);
-	slider->signal_value_changed.connect(sigc::mem_fun(this, &List::slider_value_changed));
+	add(slider);
+	slider.set_step(1);
+	slider.signal_value_changed.connect(sigc::mem_fun(this, &List::slider_value_changed));
 
 	update_style();
 }
 
-List::~List()
-{
-	delete slider;
-}
-
 void List::append(const string &v)
 {
 	items.push_back(v);
@@ -99,17 +96,9 @@ const string &List::get_selected() const
 
 void List::button_press(int x, int y, unsigned btn)
 {
-	if(slider->get_geometry().is_inside(x, y))
-	{
-		const Geometry &sgeom=slider->get_geometry();
-		slider->button_press(x-sgeom.x, y-sgeom.y, btn);
-		slider_active=true;
-	}
-	else if(btn==1)
+	Container::button_press(x, y, btn);
+	if(!click_focus && btn==1)
 	{
-		const GL::Font *const font=style->get_font();
-		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;
 
@@ -123,33 +112,13 @@ void List::button_press(int x, int y, unsigned btn)
 	}
 }
 
-void List::button_release(int x, int y, unsigned btn)
-{
-	if(slider_active)
-	{
-		const Geometry &sgeom=slider->get_geometry();
-		slider->button_release(x-sgeom.x, y-sgeom.y, btn);
-		slider_active=false;
-	}
-}
-
-void List::pointer_motion(int x, int y)
-{
-	if(slider_active)
-	{
-		const Geometry &sgeom=slider->get_geometry();
-		slider->pointer_motion(x-sgeom.x, y-sgeom.y);
-	}
-}
-
 void List::render_special(const Part &part) const
 {
 	if(part.get_name()=="items")
 	{
-		const GL::Font *const font=style->get_font();
-		const float font_size=font->get_default_size();
+		const GL::Font &font=*style->get_font();
+		const float font_size=font.get_default_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;
@@ -159,10 +128,10 @@ void List::render_special(const Part &part) const
 		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.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);
+			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();
@@ -170,7 +139,7 @@ void List::render_special(const Part &part) const
 			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);
+			font.draw_string(items[first+i], imm);
 			GL::pop_matrix();
 		}
 	}
@@ -178,9 +147,6 @@ void List::render_special(const Part &part) const
 	{
 		if(sel_index>=static_cast<int>(first) && sel_index<static_cast<int>(first+n_visible))
 		{
-			const GL::Font *const font=style->get_font();
-			const float font_size=font->get_default_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;
@@ -199,7 +165,7 @@ void List::render_special(const Part &part) const
 		}
 	}
 	else if(part.get_name()=="slider")
-		slider->render();
+		slider.render();
 }
 
 void List::on_geometry_change()
@@ -218,6 +184,9 @@ void List::on_style_change()
 		if(i->get_name()=="items")
 			items_part=&*i;
 
+	const GL::Font &font=*style->get_font();
+	row_height=static_cast<unsigned>((font.get_ascent()-font.get_descent())*font.get_default_size());
+
 	recalculate_parameters();
 }
 
@@ -228,15 +197,12 @@ void List::reposition_slider()
 		{
 			Geometry sgeom=i->get_geometry();
 			i->get_alignment().apply(sgeom, geom, i->get_margin());
-			slider->set_geometry(sgeom);
+			slider.set_geometry(sgeom);
 		}
 }
 
 void List::recalculate_parameters()
 {
-	const GL::Font *font=style->get_font();
-	unsigned row_height=static_cast<unsigned>(font->get_default_size());
-
 	unsigned h=geom.h;
 	if(items_part)
 	{
@@ -256,13 +222,13 @@ void List::recalculate_parameters()
 
 	if(items.size()>n_visible)
 	{
-		slider->set_range(0, items.size()-n_visible);
-		slider->set_value(items.size()-n_visible-first);
+		slider.set_range(0, items.size()-n_visible);
+		slider.set_value(items.size()-n_visible-first);
 	}
 	else
 	{
-		slider->set_range(0, 0);
-		slider->set_value(0);
+		slider.set_range(0, 0);
+		slider.set_value(0);
 	}
 }
 
@@ -281,7 +247,7 @@ List::Loader::Loader(List &l):
 
 void List::Loader::item(const string &v)
 {
-	static_cast<List &>(wdg).append(v);
+	dynamic_cast<List &>(wdg).append(v);
 }
 
 } // namespace GLtk