X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fhslider.cpp;h=dcb7634da9e633b751df9315f36bc5c5088d7e1d;hb=707b59d45ae50b69c94918f8f74313283b304597;hp=2a3644367ea52adb85beeb1f2f02abad007fc25c;hpb=eb6eee5fabf05abca4a0434c2a8f8f62c900afec;p=libs%2Fgltk.git

diff --git a/source/hslider.cpp b/source/hslider.cpp
index 2a36443..dcb7634 100644
--- a/source/hslider.cpp
+++ b/source/hslider.cpp
@@ -12,28 +12,23 @@ HSlider::HSlider():
 	slider_size(1)
 { }
 
-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)
+		if(!graphic || !graphic->get_texture())
 			return;
 
 		Alignment align = part.get_alignment();
@@ -43,18 +38,15 @@ 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);
 		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)
+	if(btn==1 && max>min)
 	{
 		int sx = static_cast<int>((geom.w-slider_size)*(value-min)/(max-min));
 		if(x<sx)