summaryrefslogtreecommitdiffstats
path: root/testapp/main.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'testapp/main.cpp')
-rw-r--r--testapp/main.cpp16
1 files changed, 13 insertions, 3 deletions
diff --git a/testapp/main.cpp b/testapp/main.cpp
index 3dd4e1e..9ec8a70 100644
--- a/testapp/main.cpp
+++ b/testapp/main.cpp
@@ -15,7 +15,7 @@
# include <QAbstractKineticScroller>
#endif
-#include "qscrollareakineticscroller.h"
+// #include "qscrollareakineticscroller.h"
#include <qflickgesture.h>
#include "qwebviewkineticscroller.h"
@@ -88,11 +88,11 @@ private slots:
return;
switch (page) {
case 0:
- m_settings->setKineticScroller(m_list_scroller);
+ m_settings->setKineticScroller(m_list->viewport(), m_list_scroller);
m_plot->setKineticScroller(m_list_scroller);
break;
case 1:
- m_settings->setKineticScroller(m_web_scroller);
+ m_settings->setKineticScroller(m_web, m_web_scroller);
m_plot->setKineticScroller(m_web_scroller);
break;
default:
@@ -140,6 +140,16 @@ private:
return newScroller;
} else if (QWebView *web = qobject_cast<QWebView *>(w)) {
web->grabGesture(gestureType);
+
+ QKineticScroller prop;
+ prop.
+ QFlickGestureRecognizer::setProperties(web, prop);
+
+ prop = QFlickGestureRecognizer::properties(web);
+
+ QFlicker f(web);
+ f.ensureVisible(10, 10);
+
QKineticScroller *newScroller = new QKineticScroller(web);
w->setProperty("kineticScroller", QVariant::fromValue(static_cast<QKineticScroller*>(newScroller)) );
return newScroller;