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

diff --git a/source/hslider.cpp b/source/hslider.cpp
index 8a9cbb8..2c6e968 100644
--- a/source/hslider.cpp
+++ b/source/hslider.cpp
@@ -1,5 +1,5 @@
 #include <msp/gl/matrix.h>
-#include <msp/gl/transform.h>
+#include <msp/gl/meshbuilder.h>
 #include "graphic.h"
 #include "hslider.h"
 #include "part.h"
@@ -8,69 +8,82 @@
 namespace Msp {
 namespace GLtk {
 
-HSlider::HSlider(const Resources &r):
-	Slider(r),
-	dragging(false)
+HSlider::HSlider():
+	slider_size(1)
+{ }
+
+void HSlider::autosize_special(const Part &part, Geometry &ageom)
 {
-	update_style();
+	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::button_press(int x, int y, unsigned btn)
+void HSlider::rebuild_special(const Part &part)
 {
-	if(geom.is_inside(x, y))
+	if(part.get_name()=="slider")
 	{
-		int sw=get_slider_width();
-		int sx=geom.x+static_cast<int>((geom.w-sw)*(value-min)/(max-min));
-		if(btn==1 && x>=sx && x<sx+sw)
-		{
-			dragging=true;
-			state=ACTIVE;
-			drag_start_x=x;
-			drag_start_value=value;
-		}
+		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_release(int, int, unsigned btn)
+void HSlider::button_press(int x, int, unsigned btn)
 {
-	if(btn==1)
+	if(btn==1 && max>min)
 	{
-		dragging=false;
-		state=NORMAL;
+		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 && dragging)
+		end_drag();
+}
+
 void HSlider::pointer_motion(int x, int)
 {
 	if(dragging)
-	{
-		set_value(drag_start_value+(x-drag_start_x)*(max-min)/(geom.w-get_slider_width()));
-	}
+		drag(x);
 }
 
-void HSlider::render_part(const Part &part) const
+void HSlider::on_geometry_change()
 {
-	if(part.get_name()=="slider")
-	{
-		unsigned gw=part.get_width();
-		unsigned gh=(part.get_fill_y() ? geom.h : part.get_height());
-		GL::push_matrix();
-		GL::translate((geom.w-gw)*(value-min)/(max-min), (geom.h-gh)*(part.get_alignment().y+1)/2, 0);
-		const Graphic *graphic=part.get_graphic(state);
-		graphic->render(gw, gh);
-		GL::pop_matrix();
-	}
-	else
-		Widget::render_part(part);
+	drag_area_size = geom.w-slider_size;
 }
 
-unsigned HSlider::get_slider_width() const
+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")
-			return i->get_width();
+	if(!style)
+		return;
+
+	if(const Part *slider_part = style->get_part("slider"))
+		slider_size = slider_part->get_geometry().w;
 
-	return 0;
+	on_geometry_change();
 }
 
 } // namespace GLtk