X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fhslider.cpp;h=1b6fadfcc653d5a340823e9b3fb5e1317c4f9808;hb=7286d604956ddffcbfa2df6567de866f3d5df3a2;hp=4fecfa43d61038dbba1888a3e88800cdb5967c30;hpb=08b66dd1b4478fef61525ad2dad1a1fb54eab0f0;p=libs%2Fgltk.git diff --git a/source/hslider.cpp b/source/hslider.cpp index 4fecfa4..1b6fadf 100644 --- 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 @@ -61,9 +62,9 @@ void HSlider::pointer_motion(int x, int) drag(x); } -void HSlider::on_geometry_change() +void HSlider::on_size_change() { - drag_area_size = geom.w-slider_size; + drag_area_size = geom.w-total_margin; } void HSlider::on_style_change() @@ -72,9 +73,14 @@ 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(); + on_size_change(); } } // namespace GLtk