peranger/qskinny
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pan gesture detection modified

Browse Source
This commit is contained in:
Uwe Rathmann 2019-04-18 16:13:49 +02:00
parent d55af92fb6
commit 05d9b98dd7
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/controls/QskPanGestureRecognizer.cpp
View File

@ -7,6 +7,26 @@
#include <qmath.h>
#include <qquickitem.h>
static inline bool qskIsInOrientation(
const QPointF& from, const QPointF& to, Qt::Orientations orientations )
{
if ( orientations == ( Qt::Horizontal | Qt::Vertical ) )
return true;
const qreal dx = std::fabs( to.x() - from.x() );
const qreal dy = std::fabs( to.y() - from.y() );
const qreal ratio = 0.75;
if ( orientations == Qt::Horizontal )
return ( dx >= ratio * dy );
if ( orientations == Qt::Vertical )
return ( dy >= ratio * dx );
return false; // should never happen
}
static inline qreal qskDistance(
const QPointF& from, const QPointF& to, Qt::Orientations orientations )
{
@ -202,7 +222,8 @@ void QskPanGestureRecognizer::moveEvent( const QMouseEvent* event )
const qreal dist = qskDistance(
m_data->origin, m_data->pos, m_data->orientations );
if ( ( dist >= m_data->minDistance ) || ( -dist >= m_data->minDistance ) )
if ( ( qAbs( dist ) >= m_data->minDistance ) &&
qskIsInOrientation( m_data->origin, m_data->pos, m_data->orientations ) )
{
accept();
started = true;