Move some more common slider code to the base class

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

diff --git a/source/slider.cpp b/source/slider.cpp
index de4d12e3d69646f4960d65c5ee4316901cbc9bcd..15621db5b9b06e8035523cf2a479d3549ab7e587 100644 (file)
--- a/source/slider.cpp
+++ b/source/slider.cpp
@@ -9,7 +9,8 @@ Slider::Slider():
        value(0),
        step(0.1),
        dragging(false),
-       drag_area_size(0)
+       drag_area_size(0),
+       slider_size(1)
 { }
 
 void Slider::set_value(double v)
@@ -27,7 +28,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 +47,17 @@ void Slider::set_step(double s)
        set_value(value);
 }
 
+void Slider::click(int p)
+{
+       int sp = static_cast<int>(drag_area_size*(value-min)/(max-min));
+       if(p<sp)
+               set_value(value-step*10);
+       else if(p>=static_cast<int>(sp+slider_size))
+               set_value(value+step*10);
+       else
+               start_drag(p);
+}
+
 void Slider::start_drag(int p)
 {
        dragging = true;
@@ -65,17 +80,12 @@ void Slider::end_drag()
 
 
 Slider::Loader::Loader(Slider &s):
-       Widget::Loader(s)
+       DataFile::DerivedObjectLoader<Slider, Widget::Loader>(s)
 {
        add("range", &Slider::min, &Slider::max);
        add("step",  &Slider::step);
        add("value", &Slider::value);
 }
 
-Slider &Slider::Loader::get_object() const
-{
-       return static_cast<Slider &>(obj);
-}
-
 } // namespace GLtk
 } // namespace Msp