X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fvslider.cpp;h=6bc1553ded3ad8df6f9e5e24eeeb48f582a1f3de;hb=a380303d852a3ad3f9b73ccbfbec4cf7f118123e;hp=1145b97c3c762e67dfec564997baa6d6a0114e16;hpb=eb6eee5fabf05abca4a0434c2a8f8f62c900afec;p=libs%2Fgltk.git

diff --git a/source/vslider.cpp b/source/vslider.cpp
index 1145b97..6bc1553 100644
--- a/source/vslider.cpp
+++ b/source/vslider.cpp
@@ -9,31 +9,26 @@ namespace Msp {
 namespace GLtk {
 
 VSlider::VSlider():
-	slider_size(1)
+	total_margin(0)
 { }
 
-void VSlider::autosize()
+void VSlider::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+margin.left+margin.right);
-		geom.h = std::max(geom.h, pgeom.h*3/2+margin.top+margin.bottom);
+		const Sides &margin = part.get_margin();
+		const Geometry &pgeom = part.get_geometry();
+		ageom.w = std::max(ageom.w, pgeom.w+margin.left+margin.right);
+		ageom.h = std::max(ageom.h, pgeom.h*3/2+margin.top+margin.bottom);
 	}
 }
 
-void VSlider::rebuild_special(const Part &part, CachedPart &cache)
+void VSlider::rebuild_special(const Part &part)
 {
 	if(part.get_name()=="slider")
 	{
 		const Graphic *graphic = part.get_graphic(state);
-		if(!graphic)
+		if(!graphic || !graphic->get_texture())
 			return;
 
 		Alignment align = part.get_alignment();
@@ -43,27 +38,16 @@ void VSlider::rebuild_special(const Part &part, CachedPart &cache)
 		Geometry pgeom = part.get_geometry();
 		align.apply(pgeom, geom, part.get_margin());
 
-		cache.texture = part.get_graphic(state)->get_texture();
-		cache.clear_mesh();
-
-		GL::MeshBuilder bld(*cache.mesh);
+		GL::MeshBuilder bld(part_cache.create_mesh(part, *graphic->get_texture()));
 		bld.matrix() *= GL::Matrix::translation(pgeom.x, pgeom.y, 0);
 		graphic->build(pgeom.w, pgeom.h, bld);
 	}
 }
 
-void VSlider::button_press(int x, int y, unsigned btn)
+void VSlider::button_press(int, int y, unsigned btn)
 {
-	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(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);
-	}
+	if(btn==1 && max>min)
+		click(y);
 }
 
 void VSlider::button_release(int, int, unsigned btn)
@@ -80,7 +64,7 @@ void VSlider::pointer_motion(int, int y)
 
 void VSlider::on_geometry_change()
 {
-	drag_area_size = geom.h-slider_size;
+	drag_area_size = geom.h-total_margin;
 }
 
 void VSlider::on_style_change()
@@ -89,7 +73,12 @@ void VSlider::on_style_change()
 		return;
 
 	if(const Part *slider_part = style->get_part("slider"))
+	{
 		slider_size = slider_part->get_geometry().h;
+		const Sides &margin = slider_part->get_margin();
+		drag_area_offset = margin.bottom;
+		total_margin = margin.bottom+margin.top;
+	}
 
 	on_geometry_change();
 }