summaryrefslogtreecommitdiffstats
path: root/scroller/qkineticscroller_p.h
diff options
context:
space:
mode:
Diffstat (limited to 'scroller/qkineticscroller_p.h')
-rw-r--r--scroller/qkineticscroller_p.h16
1 files changed, 14 insertions, 2 deletions
diff --git a/scroller/qkineticscroller_p.h b/scroller/qkineticscroller_p.h
index 6036beb..0f5e030 100644
--- a/scroller/qkineticscroller_p.h
+++ b/scroller/qkineticscroller_p.h
@@ -54,7 +54,6 @@
#include <QPointer>
#include <QObject>
#include <qkineticscroller.h>
-#include <QEvent>
#if QT_VERSION < 0x040700
# include <QTime>
#else
@@ -63,6 +62,9 @@
QT_BEGIN_NAMESPACE
+class QEvent;
+class QTimerEvent;
+
class QKineticScrollerPrivate : public QObject
{
Q_OBJECT
@@ -73,6 +75,8 @@ public:
virtual ~QKineticScrollerPrivate();
void init();
+ void sendEvent(QObject *o, QEvent *e);
+
void setState(QKineticScroller::State s);
bool pressWhileInactive(QKineticScroller::Input input, const QPointF &position, qint64 timestamp);
@@ -119,6 +123,14 @@ public:
qreal fastSwipeMaximumTime;
int framesPerSecond;
+ // widget info
+ QPointer<QObject> receiver; // the object this scroller was registered for
+
+ QPointer<QObject> target;
+ QSizeF viewportSize;
+ QPointF maximumContentPosition;
+ QPointF contentPosition;
+
// state
bool enabled;
@@ -157,7 +169,7 @@ public:
qreal overshootStartTimeY;
int timerId;
- bool cancelPress;
+ bool firstScroll;
void (*debugHook)(void *user, const QPointF &releaseVelocity, const QPointF &position, const QPointF &overshootPosition);
void *debugHookUser;