X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fhslider.cpp;h=e855fcfb4d80bf6bf44bfa81dd12a039bc895f4a;hb=4f4a17099ee8e927b55fb80c7eaf18a0b4b595db;hp=ad447c7b017e627964b3f82e384f90442e16bbe0;hpb=0af3c2393bd00f39db3bfaf5b78a7a44f0fd5ff1;p=libs%2Fgltk.git

diff --git a/source/hslider.cpp b/source/hslider.cpp
index ad447c7..e855fcf 100644
--- a/source/hslider.cpp
+++ b/source/hslider.cpp
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of libmspgltk
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
+Copyright © 2007-2008, 2010-2011  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
@@ -15,10 +15,42 @@ Distributed under the LGPL
 namespace Msp {
 namespace GLtk {
 
-HSlider::HSlider(const Resources &r):
-	Slider(r)
+HSlider::HSlider():
+	slider_size(1)
+{ }
+
+void HSlider::autosize()
 {
-	update_style();
+	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::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::button_press(int x, int y, unsigned btn)
@@ -47,24 +79,6 @@ 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;
@@ -72,9 +86,11 @@ void HSlider::on_geometry_change()
 
 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();
 }