X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fhslider.cpp;h=18a163c844258d503f4cb2601387fcc191e4bf81;hb=c8f5fd14a1fbdaaa9e1216dd5163d1f5c1b5ff27;hp=a4378f0c9e62fbf491b6b73c2759ca97e11baf7c;hpb=91997dd3189b93a67179822ec2fed5f2a7bddb74;p=libs%2Fgltk.git

diff --git a/source/hslider.cpp b/source/hslider.cpp
index a4378f0..18a163c 100644
--- a/source/hslider.cpp
+++ b/source/hslider.cpp
@@ -1,10 +1,3 @@
-/* $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 "graphic.h"
@@ -19,6 +12,40 @@ HSlider::HSlider():
 	slider_size(1)
 { }
 
+void HSlider::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*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)
 {
 	if(btn==1 && geom.is_inside_relative(x, y) && max>min)
@@ -45,24 +72,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;