X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Finput%2Fbinarycontrol.h;h=723e70dd4af8bd21573f55a5c675178eb8a5cfb0;hb=d7686e3867e3c68cec0d3767a21f9d2408383085;hp=fafa58537175cc19610742a45de9e805ef175dc1;hpb=c9626e6953c16efc66575eff80c4c0de2f739041;p=libs%2Fgui.git

diff --git a/source/input/binarycontrol.h b/source/input/binarycontrol.h
index fafa585..723e70d 100644
--- a/source/input/binarycontrol.h
+++ b/source/input/binarycontrol.h
@@ -1,6 +1,7 @@
-#ifndef MSP_GBASE_BINARYCONTROL_H_
-#define MSP_GBASE_BINARYCONTROL_H_
+#ifndef MSP_INPUT_BINARYCONTROL_H_
+#define MSP_INPUT_BINARYCONTROL_H_
 
+#include <msp/graphics/mspgui_api.h>
 #include "control.h"
 
 namespace Msp {
@@ -8,35 +9,37 @@ namespace Input {
 
 /**
 A control with two possible states.  Button state is mapped directly.  An axis
-is considered to be active when its value is within 10% of the end of the axis.
+is considered to be active when its value is above a threshold (0.5 by
+default).
 */
-class BinaryControl: public Control
+class MSPGUI_API BinaryControl: public Control
 {
 public:
 	sigc::signal<void> signal_press;
 	sigc::signal<void> signal_release;
 
 private:
-	bool state;
-	float threshold;
+	bool state = false;
+	float threshold = 0.5f;
 
 public:
-	BinaryControl();
+	BinaryControl() = default;
 	BinaryControl(const ControlSource &);
 	BinaryControl(Device &, ControlSrcType, unsigned);
+	~BinaryControl();
 
-	/**
-	Sets the threshold between states for axis sources.  No effect on button
-	sources
-	*/
+	/** Sets the threshold between states for axis sources.  No effect on button
+	sources */
 	void set_threshold(float);
 
 	bool get_state() const { return state; }
+	bool was_pressed() const { return rising_edge; }
+	bool was_released() const { return falling_edge; }
 
 private:
-	virtual void on_press();
-	virtual void on_release();
-	virtual void on_motion(float, float);
+	void on_press() override;
+	void on_release() override;
+	void on_motion(float, float) override;
 };
 
 } // namespace Input