X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Finput%2Fgesturedetector.cpp;h=145262a762ce438d03bb777ca1ed06fc325c7607;hb=ab03781d9d893bb50a1947cbef6ef2c35ae10d16;hp=98e3ff30522bdf6de8fbe7a8b052ddbadb54f92d;hpb=1b33313502f837e2b0d02d3f2d129c85a8c66064;p=libs%2Fgui.git

diff --git a/source/input/gesturedetector.cpp b/source/input/gesturedetector.cpp
index 98e3ff3..145262a 100644
--- a/source/input/gesturedetector.cpp
+++ b/source/input/gesturedetector.cpp
@@ -1,3 +1,4 @@
+#define _USE_MATH_DEFINES
 #include <cmath>
 #include <sigc++/bind_return.h>
 #include "gesturedetector.h"
@@ -27,7 +28,11 @@ GestureDetector::GestureDetector(Touchscreen &ts):
 
 string GestureDetector::get_button_name(unsigned btn) const
 {
-	if(btn==GESTURE_DRAG)
+	if(btn==GESTURE_TAP)
+		return "Tap";
+	else if(btn==GESTURE_TAP_2)
+		return "Two-finger tap";
+	else if(btn==GESTURE_DRAG)
 		return "Drag";
 	else if(btn==GESTURE_DRAG_2)
 		return "Two-finger drag";
@@ -46,7 +51,9 @@ string GestureDetector::get_axis_name(unsigned axis) const
 	else if(axis==1)
 		return "Y";
 	else if(axis==2)
-		return "Progress";
+		return "Delta X";
+	else if(axis==3)
+		return "Delta Y";
 	else
 		return Device::get_axis_name(axis);
 }
@@ -264,7 +271,8 @@ GestureDetector::TouchPoint::TouchPoint():
 	down_x(0),
 	down_y(0),
 	x(0),
-	y(0)
+	y(0),
+	threshold_exceeded(false)
 { }
 
 } // namespace Input