X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fhslider.cpp;h=e86cc4b17da02f56f8d26906eb2382ab59af0761;hb=73afd124ab87e8bace98db55517a56c797a9b8c7;hp=1575072fe782cc16689ac2009e33a94f86b4846c;hpb=3db68f2604b657e79f1b2b317c19c41c2d5a985b;p=libs%2Fgltk.git

diff --git a/source/hslider.cpp b/source/hslider.cpp
index 1575072..e86cc4b 100644
--- a/source/hslider.cpp
+++ b/source/hslider.cpp
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of libmspgltk
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
+Copyright © 2007-2008, 2010-2011  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
@@ -15,17 +15,33 @@ Distributed under the LGPL
 namespace Msp {
 namespace GLtk {
 
-HSlider::HSlider(const Resources &r):
-	Slider(r)
+HSlider::HSlider():
+	slider_size(1)
+{ }
+
+void HSlider::render_special(const Part &part) const
 {
-	update_style();
+	if(part.get_name()=="slider")
+	{
+		Alignment align = part.get_alignment();
+		if(max>min)
+			align.x = (value-min)/(max-min);
+
+		Geometry pgeom = part.get_geometry();
+		align.apply(pgeom, geom, part.get_margin());
+
+		GL::push_matrix();
+		GL::translate(pgeom.x, pgeom.y, 0);
+		part.get_graphic(state)->render(pgeom.w, pgeom.h);
+		GL::pop_matrix();
+	}
 }
 
 void HSlider::button_press(int x, int y, unsigned btn)
 {
 	if(btn==1 && geom.is_inside_relative(x, y) && max>min)
 	{
-		int sx=static_cast<int>((geom.w-slider_size)*(value-min)/(max-min));
+		int sx = static_cast<int>((geom.w-slider_size)*(value-min)/(max-min));
 		if(x<sx)
 			set_value(value-step*10);
 		else if(x>=static_cast<int>(sx+slider_size))
@@ -47,34 +63,18 @@ void HSlider::pointer_motion(int x, int)
 		drag(x);
 }
 
-void HSlider::render_special(const Part &part) const
-{
-	if(part.get_name()=="slider")
-	{
-		Alignment align=part.get_alignment();
-		if(max>min)
-			align.x=(value-min)/(max-min);
-
-		Geometry pgeom=part.get_geometry();
-		align.apply(pgeom, geom, part.get_margin());
-
-		GL::push_matrix();
-		GL::translate(pgeom.x, pgeom.y, 0);
-		part.get_graphic(state)->render(pgeom.w, pgeom.h);
-		GL::pop_matrix();
-	}
-}
-
 void HSlider::on_geometry_change()
 {
-	drag_area_size=geom.w-slider_size;
+	drag_area_size = geom.w-slider_size;
 }
 
 void HSlider::on_style_change()
 {
-	for(PartSeq::const_iterator i=style->get_parts().begin(); i!=style->get_parts().end(); ++i)
-		if(i->get_name()=="slider")
-			slider_size=i->get_geometry().w;
+	if(!style)
+		return;
+
+	if(const Part *slider_part = style->get_part("slider"))
+		slider_size = slider_part->get_geometry().w;
 
 	on_geometry_change();
 }