X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fhslider.cpp;h=1b6fadfcc653d5a340823e9b3fb5e1317c4f9808;hb=7286d604956ddffcbfa2df6567de866f3d5df3a2;hp=837b2ba5c2dae4a0344da91665661079c7e427ef;hpb=319cde3c06181ba1c3619567525002926d8b4889;p=libs%2Fgltk.git

diff --git a/source/hslider.cpp b/source/hslider.cpp
index 837b2ba..1b6fadf 100644
--- a/source/hslider.cpp
+++ b/source/hslider.cpp
@@ -9,22 +9,17 @@ namespace Msp {
 namespace GLtk {
 
 HSlider::HSlider():
-	slider_size(1)
+	total_margin(0)
 { }
 
-void HSlider::autosize()
+void HSlider::autosize_special(const Part &part, Geometry &ageom) const
 {
-	if(!style)
-		return;
-
-	Widget::autosize();
-
-	if(const Part *slider_part = style->get_part("slider"))
+	if(part.get_name()=="slider")
 	{
-		const Sides &margin = slider_part->get_margin();
-		const Geometry &pgeom = slider_part->get_geometry();
-		geom.w = std::max(geom.w, pgeom.w*3/2+margin.left+margin.right);
-		geom.h = std::max(geom.h, pgeom.h+margin.top+margin.bottom);
+		const Sides &margin = part.get_margin();
+		const Geometry &pgeom = part.get_geometry();
+		ageom.w = std::max(ageom.w, pgeom.w*3/2+margin.left+margin.right);
+		ageom.h = std::max(ageom.h, pgeom.h+margin.top+margin.bottom);
 	}
 }
 
@@ -49,18 +44,10 @@ void HSlider::rebuild_special(const Part &part)
 	}
 }
 
-void HSlider::button_press(int x, int y, unsigned btn)
+void HSlider::button_press(int x, int, 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));
-		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);
-	}
+	if(btn==1 && max>min)
+		click(x);
 }
 
 void HSlider::button_release(int, int, unsigned btn)
@@ -75,9 +62,9 @@ void HSlider::pointer_motion(int x, int)
 		drag(x);
 }
 
-void HSlider::on_geometry_change()
+void HSlider::on_size_change()
 {
-	drag_area_size = geom.w-slider_size;
+	drag_area_size = geom.w-total_margin;
 }
 
 void HSlider::on_style_change()
@@ -86,9 +73,14 @@ void HSlider::on_style_change()
 		return;
 
 	if(const Part *slider_part = style->get_part("slider"))
+	{
 		slider_size = slider_part->get_geometry().w;
+		const Sides &margin = slider_part->get_margin();
+		drag_area_offset = margin.left;
+		total_margin = margin.left+margin.right;
+	}
 
-	on_geometry_change();
+	on_size_change();
 }
 
 } // namespace GLtk