Properly account for margins in sliders

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

diff --git a/source/slider.cpp b/source/slider.cpp
index 3392ac4a1e83ce1f84b6e047abebf9d33a6e0c4e..1e763c639bf5309fba69d3a3ce3e680aba97eff1 100644 (file)
--- a/source/slider.cpp
+++ b/source/slider.cpp
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of libmspgltk
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include "slider.h"
 
 namespace Msp {
@@ -16,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)
@@ -34,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)
@@ -50,39 +48,49 @@ void Slider::set_step(double s)
        set_value(value);
 }
 
+void Slider::click(int p)
+{
+       p -= drag_area_offset;
+       if(p<0 || p>=static_cast<int>(drag_area_size))
+               return;
+
+       int sp = static_cast<int>((drag_area_size-slider_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(drag_area_offset+p);
+}
+
 void Slider::start_drag(int p)
 {
        dragging = true;
        drag_start_pos = p;
        drag_start_value = value;
-       state |= ACTIVE;
+       set_state(ACTIVE);
 }
 
 void Slider::drag(int p)
 {
        if(max>min)
-               set_value(drag_start_value+(p-drag_start_pos)*(max-min)/drag_area_size);
+               set_value(drag_start_value+(p-drag_start_pos)*(max-min)/(drag_area_size-slider_size));
 }
 
 void Slider::end_drag()
 {
        dragging = false;
-       state &= ~ACTIVE;
+       clear_state(ACTIVE);
 }
 
 
 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 &>(wdg);
-}
-
 } // namespace GLtk
 } // namespace Msp