Properly account for margins in sliders

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

diff --git a/source/hslider.cpp b/source/hslider.cpp
index 4fecfa43d61038dbba1888a3e88800cdb5967c30..2af6f5a4a71a621574e253c37ee802d3010979c2 100644 (file)
--- a/source/hslider.cpp
+++ b/source/hslider.cpp
@@ -8,7 +8,8 @@
 namespace Msp {
 namespace GLtk {
 
-HSlider::HSlider()
+HSlider::HSlider():
+       total_margin(0)
 { }
 
 void HSlider::autosize_special(const Part &part, Geometry &ageom) const
@@ -63,7 +64,7 @@ void HSlider::pointer_motion(int x, int)
 
 void HSlider::on_geometry_change()
 {
-       drag_area_size = geom.w-slider_size;
+       drag_area_size = geom.w-total_margin;
 }
 
 void HSlider::on_style_change()
@@ -72,7 +73,12 @@ void HSlider::on_style_change()
                return;
 
        if(const Part *slider_part = style->get_part("slider"))
+       {
                slider_size = slider_part->get_geometry().w;
+               const Sides &margin = slider_part->get_margin();
+               drag_area_offset = margin.left;
+               total_margin = margin.left+margin.right;
+       }
 
        on_geometry_change();
 }