summaryrefslogtreecommitdiffstats
path: root/src/datavisualization/input/qtouch3dinputhandler_p.h
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2014-09-25 15:04:44 +0300
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2014-09-26 10:06:52 +0300
commit0ab45b018fa98e9ef6cffd70178f208eb4f16550 (patch)
tree77d324f47ccb52cc543df9e8990153b82ead2688 /src/datavisualization/input/qtouch3dinputhandler_p.h
parent36bc54f5720bddb9899e64d665117ac1e1b5bc94 (diff)
Implement zooming to cursor
Zooming to cursor is now default operating mode of the default input handler. Task-number: QTRD-3263 Change-Id: I5699fc0ce7393059538972cd52f31f06d87e3d8d Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'src/datavisualization/input/qtouch3dinputhandler_p.h')
-rw-r--r--src/datavisualization/input/qtouch3dinputhandler_p.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/datavisualization/input/qtouch3dinputhandler_p.h b/src/datavisualization/input/qtouch3dinputhandler_p.h
index 613b5f28..b01904ca 100644
--- a/src/datavisualization/input/qtouch3dinputhandler_p.h
+++ b/src/datavisualization/input/qtouch3dinputhandler_p.h
@@ -19,7 +19,7 @@
#ifndef QTOUCH3DINPUTHANDLER_P_H
#define QTOUCH3DINPUTHANDLER_P_H
-#include "qabstract3dinputhandler_p.h"
+#include "q3dinputhandler_p.h"
#include "qtouch3dinputhandler.h"
class QTimer;
@@ -28,7 +28,7 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION
class QAbstract3DInputHandler;
-class QTouch3DInputHandlerPrivate : public QObject
+class QTouch3DInputHandlerPrivate : public Q3DInputHandlerPrivate
{
Q_OBJECT
@@ -36,13 +36,14 @@ public:
QTouch3DInputHandlerPrivate(QTouch3DInputHandler *q);
~QTouch3DInputHandlerPrivate();
- void handlePinchZoom(float distance);
+ void handlePinchZoom(float distance, const QPoint &pos);
void handleTapAndHold();
void handleSelection(const QPointF &position);
void handleRotation(const QPointF &position);
-public:
+private:
QTouch3DInputHandler *q_ptr;
+public:
QTimer *m_holdTimer;
QAbstract3DInputHandlerPrivate::InputState m_inputState;
QPointF m_startHoldPos;