Avoid autosizing widgets with no style

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

diff --git a/source/slider.cpp b/source/slider.cpp
index 7a0029e05b79e430839bf560d5ff1fe7757c33ba..32e221e36dba39d56776570e0b99209c4ce873d9 100644 (file)
--- a/source/slider.cpp
+++ b/source/slider.cpp
@@ -48,34 +48,32 @@ 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);
 }
 
 
 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 &>(obj);
-}
-
 } // namespace GLtk
 } // namespace Msp