X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fvslider.cpp;h=ed2e0bc5123d0a6cfad0b43cdf73f6faf15bc13c;hb=0af3c2393bd00f39db3bfaf5b78a7a44f0fd5ff1;hp=d9e9e4dee5f5cdeb9201e2f518cc888ed1eee75e;hpb=c435423919a20a87d100e1ee4cd1fc6ce223040c;p=libs%2Fgltk.git

diff --git a/source/vslider.cpp b/source/vslider.cpp
index d9e9e4d..ed2e0bc 100644
--- a/source/vslider.cpp
+++ b/source/vslider.cpp
@@ -23,24 +23,22 @@ VSlider::VSlider(const Resources &r):
 
 void VSlider::button_press(int x, int y, unsigned btn)
 {
-	if(geom.is_inside_relative(x, y) && max>min)
+	if(btn==1 && geom.is_inside_relative(x, y) && max>min)
 	{
-		int sy=static_cast<int>((geom.h-slider_size)*(value-min)/(max-min));
-		if(btn==1 && y>=sy && y<static_cast<int>(sy+slider_size))
-		{
-			state=ACTIVE;
+		int sy = static_cast<int>((geom.h-slider_size)*(value-min)/(max-min));
+		if(y<sy)
+			set_value(value-step*10);
+		else if(y>=static_cast<int>(sy+slider_size))
+			set_value(value+step*10);
+		else
 			start_drag(y);
-		}
 	}
 }
 
 void VSlider::button_release(int, int, unsigned btn)
 {
 	if(btn==1 && dragging)
-	{
 		end_drag();
-		state=NORMAL;
-	}
 }
 
 void VSlider::pointer_motion(int, int y)
@@ -53,11 +51,11 @@ void VSlider::render_special(const Part &part) const
 {
 	if(part.get_name()=="slider")
 	{
-		Alignment align=part.get_alignment();
+		Alignment align = part.get_alignment();
 		if(max>min)
-			align.y=(value-min)/(max-min);
+			align.y = (value-min)/(max-min);
 
-		Geometry pgeom=part.get_geometry();
+		Geometry pgeom = part.get_geometry();
 		align.apply(pgeom, geom, part.get_margin());
 
 		GL::push_matrix();
@@ -69,14 +67,14 @@ void VSlider::render_special(const Part &part) const
 
 void VSlider::on_geometry_change()
 {
-	drag_area_size=geom.h-slider_size;
+	drag_area_size = geom.h-slider_size;
 }
 
 void VSlider::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().h;
+			slider_size = i->get_geometry().h;
 
 	on_geometry_change();
 }