X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fvslider.cpp;h=954bb19520702a24033468cecfbf8089bbf3e168;hb=75a16eae9eb2714f8112d46fa5b8f7908b6d2487;hp=397713b6c7c9bda5529fa93661205f85d402aee8;hpb=8f6f543758fb1b2b17ae2db519198d420eb9982d;p=libs%2Fgltk.git

diff --git a/source/vslider.cpp b/source/vslider.cpp
index 397713b..954bb19 100644
--- a/source/vslider.cpp
+++ b/source/vslider.cpp
@@ -16,43 +16,35 @@ namespace Msp {
 namespace GLtk {
 
 VSlider::VSlider(const Resources &r):
-	Slider(r),
-	dragging(false)
+	Slider(r)
 {
 	update_style();
 }
 
 void VSlider::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 sh=get_slider_height();
-		int sy=geom.y+static_cast<int>((geom.h-sh)*(value-min)/(max-min));
-		if(btn==1 && y>=sy && y<sy+sh)
-		{
-			dragging=true;
-			state=ACTIVE;
-			drag_start_y=y;
-			drag_start_value=value;
-		}
+		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=false;
-		state=NORMAL;
-	}
+	if(btn==1 && dragging)
+		end_drag();
 }
 
 void VSlider::pointer_motion(int, int y)
 {
 	if(dragging)
-	{
-		set_value(drag_start_value+(y-drag_start_y)*(max-min)/(geom.h-get_slider_height()));
-	}
+		drag(y);
 }
 
 void VSlider::render_special(const Part &part) const
@@ -60,7 +52,8 @@ void VSlider::render_special(const Part &part) const
 	if(part.get_name()=="slider")
 	{
 		Alignment align=part.get_alignment();
-		align.y=(value-min)/(max-min);
+		if(max>min)
+			align.y=(value-min)/(max-min);
 
 		Geometry pgeom=part.get_geometry();
 		align.apply(pgeom, geom, part.get_margin());
@@ -72,13 +65,18 @@ void VSlider::render_special(const Part &part) const
 	}
 }
 
-unsigned VSlider::get_slider_height() const
+void VSlider::on_geometry_change()
+{
+	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")
-			return i->get_geometry().h;
+			slider_size=i->get_geometry().h;
 
-	return 0;
+	on_geometry_change();
 }
 
 } // namespace GLtk