X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fhslider.cpp;h=ad447c7b017e627964b3f82e384f90442e16bbe0;hb=ae991f3bbd83fa0afff5e1fc31be50e1f2d17875;hp=a0caca54b17d2292a68f9fc219d27ace4b74a74f;hpb=50bf1ef2e2c3c38de20f6996a6c5ed0066111177;p=libs%2Fgltk.git

diff --git a/source/hslider.cpp b/source/hslider.cpp
index a0caca5..ad447c7 100644
--- a/source/hslider.cpp
+++ b/source/hslider.cpp
@@ -23,17 +23,21 @@ HSlider::HSlider(const Resources &r):
 
 void HSlider::button_press(int x, int y, unsigned btn)
 {
-	if(geom.is_inside(x, y))
+	if(btn==1 && geom.is_inside_relative(x, y) && max>min)
 	{
-		int sx=geom.x+static_cast<int>((geom.w-slider_size)*(value-min)/(max-min));
-		if(btn==1 && x>=sx && x<static_cast<int>(sx+slider_size))
+		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))
+			set_value(value+step*10);
+		else
 			start_drag(x);
 	}
 }
 
 void HSlider::button_release(int, int, unsigned btn)
 {
-	if(btn==1)
+	if(btn==1 && dragging)
 		end_drag();
 }
 
@@ -47,11 +51,11 @@ void HSlider::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.x=(value-min)/(max-min);
+			align.x = (value-min)/(max-min);
 
-		Geometry pgeom=part.get_geometry();
+		Geometry pgeom = part.get_geometry();
 		align.apply(pgeom, geom, part.get_margin());
 
 		GL::push_matrix();
@@ -63,14 +67,14 @@ void HSlider::render_special(const Part &part) const
 
 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;
+			slider_size = i->get_geometry().w;
 
 	on_geometry_change();
 }