X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fslider.cpp;h=7123458c0e41b7268ce44b7c556543dfd2af9aa1;hb=a4d18206b6352b3240ad9697aed10e2066d160bd;hp=4565675916433920d47e3699fe8155a7cd16e652;hpb=73afd124ab87e8bace98db55517a56c797a9b8c7;p=libs%2Fgltk.git diff --git a/source/slider.cpp b/source/slider.cpp index 4565675..7123458 100644 --- 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 { @@ -34,7 +27,10 @@ void Slider::set_value(double v) } if(value!=old_value) + { signal_value_changed.emit(value); + rebuild(); + } } void Slider::set_range(double a, double b) @@ -55,7 +51,7 @@ 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) @@ -67,22 +63,17 @@ void Slider::drag(int p) void Slider::end_drag() { dragging = false; - state &= ~ACTIVE; + clear_state(ACTIVE); } Slider::Loader::Loader(Slider &s): - Widget::Loader(s) + DataFile::DerivedObjectLoader(s) { add("range", &Slider::min, &Slider::max); add("step", &Slider::step); add("value", &Slider::value); } -Slider &Slider::Loader::get_object() const -{ - return static_cast(obj); -} - } // namespace GLtk } // namespace Msp