Pass coordinates relative to the receiving widget's geometry

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

diff --git a/source/hslider.cpp b/source/hslider.cpp
index 3b68dacfa1b142eafe31851ed6f8dfc6fcd5d64e..32d0f6521b98f3ddae610557d71625d30aaed43e 100644 (file)
--- a/source/hslider.cpp
+++ b/source/hslider.cpp
@@ -16,8 +16,7 @@ namespace Msp {
 namespace GLtk {
 
 HSlider::HSlider(const Resources &r):
-       Slider(r),
-       dragging(false)
+       Slider(r)
 {
        update_style();
 }
@@ -26,14 +25,11 @@ void HSlider::button_press(int x, int y, unsigned btn)
 {
        if(geom.is_inside(x, y))
        {
-               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)
+               int sx=geom.x+static_cast<int>((geom.w-slider_size)*(value-min)/(max-min));
+               if(btn==1 && x>=sx && x<static_cast<int>(sx+slider_size))
                {
-                       dragging=true;
                        state=ACTIVE;
-                       drag_start_x=x;
-                       drag_start_value=value;
+                       start_drag(x);
                }
        }
 }
@@ -42,7 +38,7 @@ void HSlider::button_release(int, int, unsigned btn)
 {
        if(btn==1)
        {
-               dragging=false;
+               end_drag();
                state=NORMAL;
        }
 }
@@ -50,9 +46,7 @@ void HSlider::button_release(int, int, unsigned btn)
 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
@@ -60,7 +54,8 @@ void HSlider::render_special(const Part &part) const
        if(part.get_name()=="slider")
        {
                Alignment align=part.get_alignment();
-               align.x=(value-min)/(max-min);
+               if(max>min)
+                       align.x=(value-min)/(max-min);
 
                Geometry pgeom=part.get_geometry();
                align.apply(pgeom, geom, part.get_margin());
@@ -72,13 +67,18 @@ void HSlider::render_special(const Part &part) const
        }
 }
 
-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