Pass coordinates relative to the receiving widget's geometry

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

diff --git a/source/vslider.cpp b/source/vslider.cpp
index 397713b6c7c9bda5529fa93661205f85d402aee8..d9e9e4dee5f5cdeb9201e2f518cc888ed1eee75e 100644 (file)
--- a/source/vslider.cpp
+++ b/source/vslider.cpp
@@ -16,33 +16,29 @@ namespace Msp {
 namespace GLtk {
 
 VSlider::VSlider(const Resources &r):
-       Slider(r),
-       dragging(false)
+       Slider(r)
 {
        update_style();
 }
 
 void VSlider::button_press(int x, int y, unsigned btn)
 {
-       if(geom.is_inside(x, y))
+       if(geom.is_inside_relative(x, y) && max>min)
        {
-               int sh=get_slider_height();
-               int sy=geom.y+static_cast<int>((geom.h-sh)*(value-min)/(max-min));
-               if(btn==1 && y>=sy && y<sy+sh)
+               int sy=static_cast<int>((geom.h-slider_size)*(value-min)/(max-min));
+               if(btn==1 && y>=sy && y<static_cast<int>(sy+slider_size))
                {
-                       dragging=true;
                        state=ACTIVE;
-                       drag_start_y=y;
-                       drag_start_value=value;
+                       start_drag(y);
                }
        }
 }
 
 void VSlider::button_release(int, int, unsigned btn)
 {
-       if(btn==1)
+       if(btn==1 && dragging)
        {
-               dragging=false;
+               end_drag();
                state=NORMAL;
        }
 }
@@ -50,9 +46,7 @@ void VSlider::button_release(int, int, unsigned btn)
 void VSlider::pointer_motion(int, int y)
 {
        if(dragging)
-       {
-               set_value(drag_start_value+(y-drag_start_y)*(max-min)/(geom.h-get_slider_height()));
-       }
+               drag(y);
 }
 
 void VSlider::render_special(const Part &part) const
@@ -60,7 +54,8 @@ void VSlider::render_special(const Part &part) const
        if(part.get_name()=="slider")
        {
                Alignment align=part.get_alignment();
-               align.y=(value-min)/(max-min);
+               if(max>min)
+                       align.y=(value-min)/(max-min);
 
                Geometry pgeom=part.get_geometry();
                align.apply(pgeom, geom, part.get_margin());
@@ -72,13 +67,18 @@ void VSlider::render_special(const Part &part) const
        }
 }
 
-unsigned VSlider::get_slider_height() const
+void VSlider::on_geometry_change()
+{
+       drag_area_size=geom.h-slider_size;
+}
+
+void VSlider::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().h;
+                       slider_size=i->get_geometry().h;
 
-       return 0;
+       on_geometry_change();
 }
 
 } // namespace GLtk