Jump 10 steps when slider trough is clicked

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

diff --git a/source/hslider.cpp b/source/hslider.cpp
index d764797971029c08da73015f391e6ab6a9867795..1575072fe782cc16689ac2009e33a94f86b4846c 100644 (file)
--- a/source/hslider.cpp
+++ b/source/hslider.cpp
@@ -16,67 +16,67 @@ namespace Msp {
 namespace GLtk {
 
 HSlider::HSlider(const Resources &r):
-       Slider(r),
-       dragging(false)
+       Slider(r)
 {
        update_style();
 }
 
 void HSlider::button_press(int x, int y, unsigned btn)
 {
-       if(geom.is_inside(x, y))
+       if(btn==1 && geom.is_inside_relative(x, y) && max>min)
        {
-               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;
-               }
+               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=false;
-               state=NORMAL;
-       }
+       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_special(const Part &part) const
 {
        if(part.get_name()=="slider")
        {
-               const Geometry &pgeom=part.get_geometry();
-               unsigned gw=pgeom.w;
-               unsigned gh=(part.get_fill_y() ? geom.h : pgeom.h);
+               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((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::translate(pgeom.x, pgeom.y, 0);
+               part.get_graphic(state)->render(pgeom.w, pgeom.h);
                GL::pop_matrix();
        }
 }
 
-unsigned HSlider::get_slider_width() const
+void HSlider::on_geometry_change()
+{
+       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")
-                       return i->get_geometry().w;
+                       slider_size=i->get_geometry().w;
 
-       return 0;
+       on_geometry_change();
 }
 
 } // namespace GLtk