X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fvslider.cpp;h=6a21c5301ad6eb45a51d2ff201ababb271a02f21;hb=319cde3c06181ba1c3619567525002926d8b4889;hp=0b5dd0ca1efe54cb178a4a4959b04215a0b78496;hpb=787dd5572e904a87686e7309401b86e0c528d823;p=libs%2Fgltk.git

diff --git a/source/vslider.cpp b/source/vslider.cpp
index 0b5dd0c..6a21c53 100644
--- a/source/vslider.cpp
+++ b/source/vslider.cpp
@@ -1,12 +1,5 @@
-/* $Id$
-
-This file is part of libmspgltk
-Copyright © 2007  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"
@@ -15,10 +8,45 @@ Distributed under the LGPL
 namespace Msp {
 namespace GLtk {
 
-VSlider::VSlider(const Resources &r):
-	Slider(r)
+VSlider::VSlider():
+	slider_size(1)
+{ }
+
+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)
 {
-	update_style();
+	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.y = (value-min)/(max-min);
+
+		Geometry pgeom = part.get_geometry();
+		align.apply(pgeom, geom, part.get_margin());
+
+		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 VSlider::button_press(int x, int y, unsigned btn)
@@ -47,24 +75,6 @@ void VSlider::pointer_motion(int, int y)
 		drag(y);
 }
 
-void VSlider::render_special(const Part &part) const
-{
-	if(part.get_name()=="slider")
-	{
-		Alignment align = part.get_alignment();
-		if(max>min)
-			align.y = (value-min)/(max-min);
-
-		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();
-	}
-}
-
 void VSlider::on_geometry_change()
 {
 	drag_area_size = geom.h-slider_size;
@@ -72,6 +82,9 @@ void VSlider::on_geometry_change()
 
 void VSlider::on_style_change()
 {
+	if(!style)
+		return;
+
 	if(const Part *slider_part = style->get_part("slider"))
 		slider_size = slider_part->get_geometry().h;