diff options
| author | Robert Griebl <robert.griebl@nokia.com> | 2010-11-30 21:44:52 (GMT) |
|---|---|---|
| committer | Robert Griebl <robert.griebl@nokia.com> | 2010-12-02 00:04:34 (GMT) |
| commit | 0274e68767cce6440515a68d6af868725d5577a4 (patch) | |
| tree | 7b219fb5cce3c9e76ae966f13401ae13bad9b28d /src/gui/widgets/qabstractscrollarea_p.h | |
| parent | f6f8ba94d5f82b8df723a217a3d0ecb50e570cbc (diff) | |
| download | Qt-0274e68767cce6440515a68d6af868725d5577a4.zip Qt-0274e68767cce6440515a68d6af868725d5577a4.tar.gz Qt-0274e68767cce6440515a68d6af868725d5577a4.tar.bz2 | |
QScroller merge, part 1
This merge consists of the actual kinetic scroller implementation, its
autotests plus a few examples. QAbstractScrollArea and QAbstractItemView
have been extended to support the new scroll events.
The complete history is in
http://scm.dev.nokia.troll.no/projects/qt/repos/rgriebls-qt-flickgesture/logs/4.7-flickgesture
(part 2 is the QML Flickable replacement / part 3 is QWebView support)
Task-number: QTBUG-9054
Reviewed-by: Ralf Engels
Diffstat (limited to 'src/gui/widgets/qabstractscrollarea_p.h')
| -rw-r--r-- | src/gui/widgets/qabstractscrollarea_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/widgets/qabstractscrollarea_p.h b/src/gui/widgets/qabstractscrollarea_p.h index 9a0d66f..8dbb3e4 100644 --- a/src/gui/widgets/qabstractscrollarea_p.h +++ b/src/gui/widgets/qabstractscrollarea_p.h @@ -84,11 +84,13 @@ public: int left, top, right, bottom; // viewport margin int xoffset, yoffset; + QPoint overshoot; void init(); void layoutChildren(); // ### Fix for 4.4, talk to Bjoern E or Girish. virtual void scrollBarPolicyChanged(Qt::Orientation, Qt::ScrollBarPolicy) {} + bool canStartScrollingAt( const QPoint &startPos ); void _q_hslide(int); void _q_vslide(int); |