X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fslider.cpp;h=1e763c639bf5309fba69d3a3ce3e680aba97eff1;hb=a380303d852a3ad3f9b73ccbfbec4cf7f118123e;hp=cb24c002b1a497bb5502f81bb566a434d5abd3c6;hpb=c062ca892fc6e10f74a76991b5d4b4349c046b5f;p=libs%2Fgltk.git

diff --git a/source/slider.cpp b/source/slider.cpp
index cb24c00..1e763c6 100644
--- a/source/slider.cpp
+++ b/source/slider.cpp
@@ -3,28 +3,93 @@
 namespace Msp {
 namespace GLtk {
 
-Slider::Slider(const Resources &r):
-	Widget(r),
+Slider::Slider():
 	min(0),
 	max(1),
 	value(0),
-	step(0.1)
-{
-}
+	step(0.1),
+	dragging(false),
+	drag_area_size(0),
+	drag_area_offset(0),
+	slider_size(1)
+{ }
 
 void Slider::set_value(double v)
 {
+	double old_value = value;
+
 	if(v<min)
-		value=min;
+		value = min;
 	else if(v>max)
-		value=max;
+		value = max;
 	else
 	{
-		unsigned steps=static_cast<unsigned>((v-min)/step+0.5);
-		value=min+steps*step;
+		unsigned steps = static_cast<unsigned>((v-min)/step+0.5);
+		value = min+steps*step;
+	}
+
+	if(value!=old_value)
+	{
+		signal_value_changed.emit(value);
+		rebuild();
 	}
+}
+
+void Slider::set_range(double a, double b)
+{
+	min = a;
+	max = b;
+	set_value(value);
+}
+
+void Slider::set_step(double s)
+{
+	step = s;
+	set_value(value);
+}
+
+void Slider::click(int p)
+{
+	p -= drag_area_offset;
+	if(p<0 || p>=static_cast<int>(drag_area_size))
+		return;
 
-	signal_value_changed.emit(value);
+	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;
+	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-slider_size));
+}
+
+void Slider::end_drag()
+{
+	dragging = false;
+	clear_state(ACTIVE);
+}
+
+
+Slider::Loader::Loader(Slider &s):
+	DataFile::DerivedObjectLoader<Slider, Widget::Loader>(s)
+{
+	add("range", &Slider::min, &Slider::max);
+	add("step",  &Slider::step);
+	add("value", &Slider::value);
 }
 
 } // namespace GLtk