1 files changed, 22 insertions, 6 deletions
diff --git a/testapp/settingswidget.cpp b/testapp/settingswidget.cpp
index 30f1d90..f61f297 100644
--- a/testapp/settingswidget.cpp
+++ b/testapp/settingswidget.cpp
@@ -51,8 +51,11 @@
 #include <QCheckBox>
 #include <QScrollArea>
 
+#include <QDebug>
+
 #include "settingswidget.h"
 #include "qkineticscroller.h"
+#include "qflickgesture.h"
 
 struct MetricItem
 {
@@ -69,7 +72,8 @@ class MetricItemUpdater : public QObject
     Q_OBJECT
 public:
     MetricItemUpdater(MetricItem *item)
-        : m_item(item), m_scroller(0)
+        : m_item(item)
+        , m_scroller(0)
     {
         if (m_item->min.type() == QVariant::PointF) {
             m_slider = new QSlider(Qt::Horizontal);
@@ -277,7 +281,10 @@ public:
 };
 
 SettingsWidget::SettingsWidget(bool smallscreen)
-    : QScrollArea(), m_scroller(0), m_smallscreen(smallscreen)
+    : QScrollArea()
+    , m_widget(0)
+    , m_scroller(0)
+      , m_smallscreen(smallscreen)
 {
     setWindowTitle(QLatin1String("Settings"));
     QWidget *view = new QWidget();
@@ -368,8 +375,9 @@ SettingsWidget::SettingsWidget(bool smallscreen)
     setWidgetResizable(true);
 }
 
-void SettingsWidget::setKineticScroller(QKineticScroller *scroller)
+void SettingsWidget::setKineticScroller(QWidget *widget, QKineticScroller *scroller)
 {
+    m_widget = widget;
     m_scroller = scroller;
     //setEnabled(m_scroller);
 
@@ -380,8 +388,8 @@ void SettingsWidget::setKineticScroller(QKineticScroller *scroller)
     if (!m_scroller)
         return;
 
-    m_onoff->setChecked(m_scroller->isEnabled());
-    m_dpi->setValue(m_scroller->dpi());
+    //TODO m_onoff->setChecked(m_scroller->isEnabled());
+    //TODO m_dpi->setValue(m_scroller->dpi());
     m_hospolicy->setCurrentIndex(m_hospolicy->findData(m_scroller->horizontalOvershootPolicy()));
     m_vospolicy->setCurrentIndex(m_vospolicy->findData(m_scroller->verticalOvershootPolicy()));
 
@@ -399,14 +407,18 @@ void SettingsWidget::setKineticScroller(QKineticScroller *scroller)
 
 void SettingsWidget::enabledChanged(bool on)
 {
+    /* TODO
     if (m_scroller)
         m_scroller->setEnabled(on);
+        */
 }
 
 void SettingsWidget::dpiChanged(int dpi)
 {
+    /* TODO
     if (m_scroller)
         m_scroller->setDpi(dpi);
+        */
 }
 
 void SettingsWidget::overshootPolicyChanged(int index)
@@ -427,7 +439,11 @@ void SettingsWidget::scrollTo()
         return;
     if (!m_scroller)
         return;
-    m_scroller->scrollTo(QPointF(m_scrollx->value(), m_scrolly->value()), m_scrolltime->value());
+
+qDebug() << "SettingsWidget::scrollTo" << m_scrollx->value();
+
+    QFlickGesture *flick = QFlickGestureRecognizer::getFlickGesture(m_widget);
+    flick->scrollTo(QPointF(m_scrollx->value(), m_scrolly->value()), m_scrolltime->value());
 }
 
 #include "settingswidget.moc"