X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fslider.cpp;h=1e763c639bf5309fba69d3a3ce3e680aba97eff1;hb=7a479bd688449ec150196f033855af7713fddc0e;hp=32e221e36dba39d56776570e0b99209c4ce873d9;hpb=df07e8f3e239b146cbc458d3cbd69758e590d255;p=libs%2Fgltk.git diff --git a/source/slider.cpp b/source/slider.cpp index 32e221e..1e763c6 100644 --- a/source/slider.cpp +++ b/source/slider.cpp @@ -9,7 +9,9 @@ Slider::Slider(): value(0), step(0.1), dragging(false), - drag_area_size(0) + drag_area_size(0), + drag_area_offset(0), + slider_size(1) { } void Slider::set_value(double v) @@ -27,7 +29,10 @@ void Slider::set_value(double v) } if(value!=old_value) + { signal_value_changed.emit(value); + rebuild(); + } } void Slider::set_range(double a, double b) @@ -43,6 +48,21 @@ void Slider::set_step(double s) set_value(value); } +void Slider::click(int p) +{ + p -= drag_area_offset; + if(p<0 || p>=static_cast(drag_area_size)) + return; + + int sp = static_cast((drag_area_size-slider_size)*(value-min)/(max-min)); + if(p=static_cast(sp+slider_size)) + set_value(value+step*10); + else + start_drag(drag_area_offset+p); +} + void Slider::start_drag(int p) { dragging = true; @@ -54,10 +74,7 @@ void Slider::start_drag(int p) void Slider::drag(int p) { if(max>min) - { - set_value(drag_start_value+(p-drag_start_pos)*(max-min)/drag_area_size); - rebuild(); - } + set_value(drag_start_value+(p-drag_start_pos)*(max-min)/(drag_area_size-slider_size)); } void Slider::end_drag()