Store the Resources reference only in Root widget

[libs/gltk.git] / source / hslider.cpp

diff --git a/source/hslider.cpp b/source/hslider.cpp
index e9db05f16cf950860cccd69002e82356c79c71dd..a4378f0c9e62fbf491b6b73c2759ca97e11baf7c 100644 (file)
--- a/source/hslider.cpp
+++ b/source/hslider.cpp
@@ -15,18 +15,20 @@ Distributed under the LGPL
 namespace Msp {
 namespace GLtk {
 
-HSlider::HSlider(const Resources &r):
-       Slider(r)
-{
-       update_style();
-}
+HSlider::HSlider():
+       slider_size(1)
+{ }
 
 void HSlider::button_press(int x, int y, unsigned btn)
 {
-       if(geom.is_inside_relative(x, y) && max>min)
+       if(btn==1 && geom.is_inside_relative(x, y) && max>min)
        {
-               int sx=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);
        }
 }
@@ -47,11 +49,11 @@ void HSlider::render_special(const Part &part) const
 {
        if(part.get_name()=="slider")
        {
-               Alignment align=part.get_alignment();
+               Alignment align = part.get_alignment();
                if(max>min)
-                       align.x=(value-min)/(max-min);
+                       align.x = (value-min)/(max-min);
 
-               Geometry pgeom=part.get_geometry();
+               Geometry pgeom = part.get_geometry();
                align.apply(pgeom, geom, part.get_margin());
 
                GL::push_matrix();
@@ -63,14 +65,16 @@ void HSlider::render_special(const Part &part) const
 
 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();
 }