hashirama/goldendict-ng
hashirama/goldendict-ng
0
0
Fork 0
mirror of https://github.com/xiaoyifang/goldendict-ng.git synced 2024-11-27 15:24:05 +00:00
Code Issues Actions 1 Projects Releases Wiki Activity

Fix scroll gesture handling

Browse source
This commit is contained in:
Abs62 2014-02-10 18:49:44 +04:00
parent dabceff223
commit d17fde0e9c
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gestures.cc
View file

@ -165,7 +165,6 @@ started( false )
{
}
QGesture * GDSwipeGestureRecognizer::create( QObject * pTarget )
{
if ( pTarget && pTarget->isWidgetType() ) {
@ -259,8 +258,8 @@ QGestureRecognizer::Result GDSwipeGestureRecognizer::recognize( QGesture * state
int dy1 = p1.screenPos().toPoint().y() - swipe->lastPositions[ 0 ].y();
int dy2 = p2.screenPos().toPoint().y() - swipe->lastPositions[ 1 ].y();
if( qAbs( ( dx1 + dx2 ) / 2.0 ) >= MOVE_TRESHOLD ||
qAbs( ( dy1 + dy2 ) / 2.0 ) >= MOVE_TRESHOLD )
if( qAbs( ( dx1 + dx2 ) / 2.0 ) >= MOVE_X_TRESHOLD ||
qAbs( ( dy1 + dy2 ) / 2.0 ) >= MOVE_Y_TRESHOLD )
{
qreal angle1 = computeAngle( dx1, dy1 );
qreal angle2 = computeAngle( dx2, dy2 );
@ -275,8 +274,8 @@ QGestureRecognizer::Result GDSwipeGestureRecognizer::recognize( QGesture * state
break;
}
if( ( swipe->vertDirection != QSwipeGesture::NoDirection && swipe->vertDirection != vertDir ) ||
( swipe->horizDirection != QSwipeGesture::NoDirection && swipe->horizDirection != horizDir ) )
if( ( swipe->vertDirection != QSwipeGesture::NoDirection && horizDir != QSwipeGesture::NoDirection ) ||
( swipe->horizDirection != QSwipeGesture::NoDirection && vertDir != QSwipeGesture::NoDirection ) )
{
// Gesture direction changed
result = QGestureRecognizer::CancelGesture;

3
gestures.hh
View file

@ -99,7 +99,8 @@ class GDSwipeGestureRecognizer : public QGestureRecognizer
public:
GDSwipeGestureRecognizer(){}
private:
static const int MOVE_TRESHOLD = 50;
static const int MOVE_X_TRESHOLD = 100;
static const int MOVE_Y_TRESHOLD = 50;
virtual QGesture * create( QObject* pTarget );
virtual QGestureRecognizer::Result recognize( QGesture* pGesture, QObject * pWatched, QEvent * pEvent );