X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fhslider.cpp;h=e9db05f16cf950860cccd69002e82356c79c71dd;hb=14843a7e876b02d1ade422c929a066a7bab16f3b;hp=3b68dacfa1b142eafe31851ed6f8dfc6fcd5d64e;hpb=8f6f543758fb1b2b17ae2db519198d420eb9982d;p=libs%2Fgltk.git

diff --git a/source/hslider.cpp b/source/hslider.cpp
index 3b68dac..e9db05f 100644
--- a/source/hslider.cpp
+++ b/source/hslider.cpp
@@ -16,43 +16,31 @@ namespace Msp {
 namespace GLtk {
 
 HSlider::HSlider(const Resources &r):
-	Slider(r),
-	dragging(false)
+	Slider(r)
 {
 	update_style();
 }
 
 void HSlider::button_press(int x, int y, unsigned btn)
 {
-	if(geom.is_inside(x, y))
+	if(geom.is_inside_relative(x, y) && max>min)
 	{
-		int sw=get_slider_width();
-		int sx=geom.x+static_cast<int>((geom.w-sw)*(value-min)/(max-min));
-		if(btn==1 && x>=sx && x<sx+sw)
-		{
-			dragging=true;
-			state=ACTIVE;
-			drag_start_x=x;
-			drag_start_value=value;
-		}
+		int sx=static_cast<int>((geom.w-slider_size)*(value-min)/(max-min));
+		if(btn==1 && x>=sx && x<static_cast<int>(sx+slider_size))
+			start_drag(x);
 	}
 }
 
 void HSlider::button_release(int, int, unsigned btn)
 {
-	if(btn==1)
-	{
-		dragging=false;
-		state=NORMAL;
-	}
+	if(btn==1 && dragging)
+		end_drag();
 }
 
 void HSlider::pointer_motion(int x, int)
 {
 	if(dragging)
-	{
-		set_value(drag_start_value+(x-drag_start_x)*(max-min)/(geom.w-get_slider_width()));
-	}
+		drag(x);
 }
 
 void HSlider::render_special(const Part &part) const
@@ -60,7 +48,8 @@ void HSlider::render_special(const Part &part) const
 	if(part.get_name()=="slider")
 	{
 		Alignment align=part.get_alignment();
-		align.x=(value-min)/(max-min);
+		if(max>min)
+			align.x=(value-min)/(max-min);
 
 		Geometry pgeom=part.get_geometry();
 		align.apply(pgeom, geom, part.get_margin());
@@ -72,13 +61,18 @@ void HSlider::render_special(const Part &part) const
 	}
 }
 
-unsigned HSlider::get_slider_width() const
+void HSlider::on_geometry_change()
+{
+	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")
-			return i->get_geometry().w;
+			slider_size=i->get_geometry().w;
 
-	return 0;
+	on_geometry_change();
 }
 
 } // namespace GLtk