Properly account for margins in sliders

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

diff --git a/source/vslider.cpp b/source/vslider.cpp
index d32c57d1aa91b9d25c919f9d3f592b0dee9eb327..6bc1553ded3ad8df6f9e5e24eeeb48f582a1f3de 100644 (file)
--- a/source/vslider.cpp
+++ b/source/vslider.cpp
@@ -9,7 +9,7 @@ namespace Msp {
 namespace GLtk {
 
 VSlider::VSlider():
-       slider_size(1)
+       total_margin(0)
 { }
 
 void VSlider::autosize_special(const Part &part, Geometry &ageom) const
@@ -47,15 +47,7 @@ void VSlider::rebuild_special(const Part &part)
 void VSlider::button_press(int, int y, unsigned btn)
 {
        if(btn==1 && max>min)
-       {
-               int sy = static_cast<int>((geom.h-slider_size)*(value-min)/(max-min));
-               if(y<sy)
-                       set_value(value-step*10);
-               else if(y>=static_cast<int>(sy+slider_size))
-                       set_value(value+step*10);
-               else
-                       start_drag(y);
-       }
+               click(y);
 }
 
 void VSlider::button_release(int, int, unsigned btn)
@@ -72,7 +64,7 @@ void VSlider::pointer_motion(int, int y)
 
 void VSlider::on_geometry_change()
 {
-       drag_area_size = geom.h-slider_size;
+       drag_area_size = geom.h-total_margin;
 }
 
 void VSlider::on_style_change()
@@ -81,7 +73,12 @@ void VSlider::on_style_change()
                return;
 
        if(const Part *slider_part = style->get_part("slider"))
+       {
                slider_size = slider_part->get_geometry().h;
+               const Sides &margin = slider_part->get_margin();
+               drag_area_offset = margin.bottom;
+               total_margin = margin.bottom+margin.top;
+       }
 
        on_geometry_change();
 }