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

diff --git a/source/slider.cpp b/source/slider.cpp
index ead5664..dc8a28a 100644
--- a/source/slider.cpp
+++ b/source/slider.cpp
@@ -1,17 +1,9 @@
-/* $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),
@@ -22,16 +14,16 @@ Slider::Slider(const Resources &r):
 
 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)
@@ -40,35 +32,38 @@ void Slider::set_value(double v)
 
 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::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);
+		rebuild();
+	}
 }
 
 void Slider::end_drag()
 {
-	dragging=false;
-	state&=~ACTIVE;
+	dragging = false;
+	clear_state(ACTIVE);
 }
 
 
@@ -82,7 +77,7 @@ Slider::Loader::Loader(Slider &s):
 
 Slider &Slider::Loader::get_object() const
 {
-	return static_cast<Slider &>(wdg);
+	return static_cast<Slider &>(obj);
 }
 
 } // namespace GLtk