X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fvslider.cpp;h=1145b97c3c762e67dfec564997baa6d6a0114e16;hb=b15a68afd1d1c36cb953bc29bf234413991c911d;hp=65cac69846f9763efc2dead8fddc06e04bde8048;hpb=2bdaf4955fdb94e73704adcdcf0adc2b353f0ff0;p=libs%2Fgltk.git

diff --git a/source/vslider.cpp b/source/vslider.cpp
index 65cac69..1145b97 100644
--- a/source/vslider.cpp
+++ b/source/vslider.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 "part.h"
 #include "style.h"
@@ -19,10 +12,30 @@ VSlider::VSlider():
 	slider_size(1)
 { }
 
-void VSlider::render_special(const Part &part) const
+void VSlider::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+margin.left+margin.right);
+		geom.h = std::max(geom.h, pgeom.h*3/2+margin.top+margin.bottom);
+	}
+}
+
+void VSlider::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.y = (value-min)/(max-min);
@@ -30,10 +43,12 @@ void VSlider::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);
 	}
 }