X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fhslider.cpp;h=fbd9b943a8c4703dc8fe77acc542df843777173f;hb=815194201203afd6fa59e650e1007a355c829544;hp=e86cc4b17da02f56f8d26906eb2382ab59af0761;hpb=2bdaf4955fdb94e73704adcdcf0adc2b353f0ff0;p=libs%2Fgltk.git

diff --git a/source/hslider.cpp b/source/hslider.cpp
index e86cc4b..fbd9b94 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"
@@ -19,7 +12,23 @@ HSlider::HSlider():
 	slider_size(1)
 { }
 
-void HSlider::render_special(const Part &part) const
+void HSlider::autosize()
+{
+	if(!style)
+		return;
+
+	Widget::autosize();
+
+	if(const Part *slider_part = style->get_part("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);
+	}
+}
+
+void HSlider::rebuild_special(const Part &part, CachedPart &cache)
 {
 	if(part.get_name()=="slider")
 	{
@@ -30,10 +39,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);
+		part.get_graphic(state)->build(pgeom.w, pgeom.h, bld);
 	}
 }