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

diff --git a/source/slider.cpp b/source/slider.cpp
index ead5664..1e763c6 100644
--- a/source/slider.cpp
+++ b/source/slider.cpp
@@ -1,89 +1,96 @@
-/* $Id$
-
-This file is part of libmspgltk
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include "slider.h"
 
 namespace Msp {
 namespace GLtk {
 
-Slider::Slider(const Resources &r):
-	Widget(r),
+Slider::Slider():
 	min(0),
 	max(1),
 	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)
 {
-	double old_value=value;
+	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;
+	min = a;
+	max = b;
 	set_value(value);
 }
 
 void Slider::set_step(double s)
 {
-	step=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;
+
+	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;
+	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);
+		set_value(drag_start_value+(p-drag_start_pos)*(max-min)/(drag_area_size-slider_size));
 }
 
 void Slider::end_drag()
 {
-	dragging=false;
-	state&=~ACTIVE;
+	dragging = false;
+	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