diff -r ff572dfe6d86 -r 9674c1a575e9 idlehomescreen/xmluirendering/uiengine/inc/xngesturehelper.h --- a/idlehomescreen/xmluirendering/uiengine/inc/xngesturehelper.h Fri Mar 12 15:41:49 2010 +0200 +++ b/idlehomescreen/xmluirendering/uiengine/inc/xngesturehelper.h Mon Mar 15 12:39:47 2010 +0200 @@ -22,21 +22,13 @@ // System includes #include +// User includes +#include "xngesturerecogniser.h" + // Forward declarations class CXnNode; struct TPointerEvent; - -/** - * Swipe directions (left, right, none) - */ -enum TSwipeResult - { - ESwipeNone = 0, - ESwipeLeft, - ESwipeRight - }; - /** * XnGestureHelper namespace * Used for the whole gesture family - Gesture recognizer, gesture helper, @@ -50,10 +42,9 @@ class CXnGesture; // Constants - const TReal32 KGestureMinSpeedX = 300; - const TInt KGestureMinLengthX = 100; - const TInt KGestureMaxDeltaY = 100; - + const TInt KGestureMinSpeed = 25; + const TInt KGestureMinLength = 100; + /** * Implementation of CGestureHelper interface * @@ -113,8 +104,8 @@ * * @see CGestureHelper::HandlePointerEventL */ - TSwipeResult HandlePointerEventL( const TPointerEvent& aEvent ); - + TXnGestureCode HandlePointerEventL( const TPointerEvent& aEvent ); + /** Reset helper state */ void Reset(); @@ -153,7 +144,7 @@ * * @return Swiping left/right/none */ - TSwipeResult ValidSwipe(); + TXnGestureCode ValidSwipe() const; private: @@ -178,7 +169,9 @@ /** * Gesture destination, Not owned. */ - CXnNode* iDestination; + CXnNode* iDestination; + + TXnGestureCode iDirection; }; } // GestureHelper