X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fhslider.cpp;h=2c6e968695439603031234b045dfb3ded26fc458;hb=7f5b8877ae1a73d3b664d7ee6f0041b602bdd049;hp=a0caca54b17d2292a68f9fc219d27ace4b74a74f;hpb=50bf1ef2e2c3c38de20f6996a6c5ed0066111177;p=libs%2Fgltk.git

diff --git a/source/hslider.cpp b/source/hslider.cpp
index a0caca5..2c6e968 100644
--- a/source/hslider.cpp
+++ b/source/hslider.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 "hslider.h"
 #include "part.h"
@@ -15,25 +8,59 @@ Distributed under the LGPL
 namespace Msp {
 namespace GLtk {
 
-HSlider::HSlider(const Resources &r):
-	Slider(r)
+HSlider::HSlider():
+	slider_size(1)
+{ }
+
+void HSlider::autosize_special(const Part &part, Geometry &ageom)
+{
+	if(part.get_name()=="slider")
+	{
+		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)
 {
-	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.x = (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 HSlider::button_press(int x, int y, unsigned btn)
+void HSlider::button_press(int x, int, unsigned btn)
 {
-	if(geom.is_inside(x, y))
+	if(btn==1 && max>min)
 	{
-		int sx=geom.x+static_cast<int>((geom.w-slider_size)*(value-min)/(max-min));
-		if(btn==1 && x>=sx && x<static_cast<int>(sx+slider_size))
+		int sx = static_cast<int>((geom.w-slider_size)*(value-min)/(max-min));
+		if(x<sx)
+			set_value(value-step*10);
+		else if(x>=static_cast<int>(sx+slider_size))
+			set_value(value+step*10);
+		else
 			start_drag(x);
 	}
 }
 
 void HSlider::button_release(int, int, unsigned btn)
 {
-	if(btn==1)
+	if(btn==1 && dragging)
 		end_drag();
 }
 
@@ -43,34 +70,18 @@ void HSlider::pointer_motion(int x, int)
 		drag(x);
 }
 
-void HSlider::render_special(const Part &part) const
-{
-	if(part.get_name()=="slider")
-	{
-		Alignment align=part.get_alignment();
-		if(max>min)
-			align.x=(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 HSlider::on_geometry_change()
 {
-	drag_area_size=geom.w-slider_size;
+	drag_area_size = geom.w-slider_size;
 }
 
 void HSlider::on_style_change()
 {
-	for(PartSeq::const_iterator i=style->get_parts().begin(); i!=style->get_parts().end(); ++i)
-		if(i->get_name()=="slider")
-			slider_size=i->get_geometry().w;
+	if(!style)
+		return;
+
+	if(const Part *slider_part = style->get_part("slider"))
+		slider_size = slider_part->get_geometry().w;
 
 	on_geometry_change();
 }