X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fhslider.cpp;h=2a3644367ea52adb85beeb1f2f02abad007fc25c;hb=43a75e4e9be56c58be5e224f19016bb14b56a7ef;hp=e855fcfb4d80bf6bf44bfa81dd12a039bc895f4a;hpb=43ac7c4514658754d09552463425bcd344fb9ded;p=libs%2Fgltk.git

diff --git a/source/hslider.cpp b/source/hslider.cpp
index e855fcf..2a36443 100644
--- a/source/hslider.cpp
+++ b/source/hslider.cpp
@@ -1,12 +1,5 @@
-/* $Id$
-
-This file is part of libmspgltk
-Copyright © 2007-2008, 2010-2011  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include <msp/gl/matrix.h>
-#include <msp/gl/transform.h>
+#include <msp/gl/meshbuilder.h>
 #include "graphic.h"
 #include "hslider.h"
 #include "part.h"
@@ -35,10 +28,14 @@ void HSlider::autosize()
 	}
 }
 
-void HSlider::render_special(const Part &part) const
+void HSlider::rebuild_special(const Part &part, CachedPart &cache)
 {
 	if(part.get_name()=="slider")
 	{
+		const Graphic *graphic = part.get_graphic(state);
+		if(!graphic)
+			return;
+
 		Alignment align = part.get_alignment();
 		if(max>min)
 			align.x = (value-min)/(max-min);
@@ -46,10 +43,12 @@ void HSlider::render_special(const Part &part) const
 		Geometry pgeom = part.get_geometry();
 		align.apply(pgeom, geom, part.get_margin());
 
-		GL::push_matrix();
-		GL::translate(pgeom.x, pgeom.y, 0);
-		part.get_graphic(state)->render(pgeom.w, pgeom.h);
-		GL::pop_matrix();
+		cache.texture = part.get_graphic(state)->get_texture();
+		cache.clear_mesh();
+
+		GL::MeshBuilder bld(*cache.mesh);
+		bld.matrix() *= GL::Matrix::translation(pgeom.x, pgeom.y, 0);
+		graphic->build(pgeom.w, pgeom.h, bld);
 	}
 }