Consider part margins when autosizing

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

diff --git a/source/slider.cpp b/source/slider.cpp
index 3392ac4a1e83ce1f84b6e047abebf9d33a6e0c4e..dc8a28a6ff0c0ca718000cb3923c5e03c1050633 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 {
@@ -55,19 +48,22 @@ 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);
+               rebuild();
+       }
 }
 
 void Slider::end_drag()
 {
        dragging = false;
-       state &= ~ACTIVE;
+       clear_state(ACTIVE);
 }
 
 
@@ -81,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