X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fslider.h;h=a95a6a57665fd905577d3e76f54afa76ef5313f1;hb=HEAD;hp=e2d810994c51387dab238b0d38fc78d9fb59a6f0;hpb=2b70e8801c43875ed3f4135bdd0141265cff0312;p=libs%2Fgltk.git

diff --git a/source/slider.h b/source/slider.h
index e2d8109..057b194 100644
--- a/source/slider.h
+++ b/source/slider.h
@@ -2,6 +2,7 @@
 #define MSP_GLTK_SLIDER_H_
 
 #include <sigc++/sigc++.h>
+#include "mspgltk_api.h"
 #include "widget.h"
 
 namespace Msp {
@@ -9,43 +10,83 @@ namespace GLtk {
 
 /**
 Sliders are used to adjust numeric values visually.  This class provides the
-common interface for sliders - see classes HSlider and VSlider for concrete
-variations.
+common interface and logic for sliders but can't be instantiated.  Use HSlider
+or VSlider depending on which direction you want the slider to be in.
 */
-class Slider: public Widget
+class MSPGLTK_API Slider: public Widget
 {
 public:
-	class Loader: public Widget::Loader
+	class MSPGLTK_API Loader: public DataFile::DerivedObjectLoader<Slider, Widget::Loader>
 	{
 	public:
 		Loader(Slider &);
-		Slider &get_object() const;
 	};
 
+protected:
+	enum Direction
+	{
+		HORIZONTAL,
+		VERTICAL
+	};
+
+public:
 	sigc::signal<void, double> signal_value_changed;
 
 protected:
-	double min, max;
-	double value;
-	double step;
+	Direction dir;
+	double min = 0.0;
+	double max = 1.0;
+	double value = 0.0;
+	double step = 0.1;
+	double page_size = 0.25;
 
-	bool dragging;
-	double drag_start_pos;
-	double drag_start_value;
-	unsigned drag_area_size;
+	bool dragging = false;
+	double drag_start_pos = 0.0;
+	double drag_start_value = 0.0;
+	unsigned drag_area_size = 0;
+	unsigned drag_area_offset = 0;
+	unsigned slider_min_size = 1;
+	unsigned slider_size = 1;
+	unsigned total_margin = 0;
 
-	Slider();
+	Slider(Direction);
 
 public:
 	void set_value(double);
 	void set_range(double, double);
 	void set_step(double);
+	void set_page_size(double);
 	double get_value() const { return value; }
 
 protected:
-	void start_drag(int);
-	void drag(int);
-	void end_drag();
+	void autosize_special(const Part &, Geometry &) const override;
+	void rebuild_special(const Part &) override;
+
+public:
+	void button_press(int, int, unsigned) override;
+	void button_release(int, int, unsigned) override;
+	void pointer_motion(int, int) override;
+
+protected:
+	void on_size_change() override;
+	void on_style_change() override;
+};
+
+
+class MSPGLTK_API VSlider: public Slider
+{
+public:
+	VSlider(): Slider(VERTICAL) { }
+
+	const char *get_class() const override { return "vslider"; }
+};
+
+class MSPGLTK_API HSlider: public Slider
+{
+public:
+	HSlider(): Slider(HORIZONTAL) { }
+
+	const char *get_class() const override { return "hslider"; }
 };
 
 } // namespace GLtk