X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fhslider.cpp;h=4fecfa43d61038dbba1888a3e88800cdb5967c30;hb=08b66dd1b4478fef61525ad2dad1a1fb54eab0f0;hp=fbd9b943a8c4703dc8fe77acc542df843777173f;hpb=1aa6cd9b865e366737dcc9d2d36c4f8faed5bc4f;p=libs%2Fgltk.git

diff --git a/source/hslider.cpp b/source/hslider.cpp
index fbd9b94..4fecfa4 100644
--- a/source/hslider.cpp
+++ b/source/hslider.cpp
@@ -8,30 +8,28 @@
 namespace Msp {
 namespace GLtk {
 
-HSlider::HSlider():
-	slider_size(1)
+HSlider::HSlider()
 { }
 
-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);
 	}
 }
 
-void HSlider::rebuild_special(const Part &part, CachedPart &cache)
+void HSlider::rebuild_special(const Part &part)
 {
 	if(part.get_name()=="slider")
 	{
+		const Graphic *graphic = part.get_graphic(state);
+		if(!graphic || !graphic->get_texture())
+			return;
+
 		Alignment align = part.get_alignment();
 		if(max>min)
 			align.x = (value-min)/(max-min);
@@ -39,27 +37,16 @@ void HSlider::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);
-		part.get_graphic(state)->build(pgeom.w, pgeom.h, bld);
+		graphic->build(pgeom.w, pgeom.h, bld);
 	}
 }
 
-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)