Another failed attempt to make kinetic scrolling work. Simplified

ListView.

diff --git a/chaptersdialog.cpp b/chaptersdialog.cpp
index 2c8704a..24fe3dd 100644 (file)
--- a/chaptersdialog.cpp
+++ b/chaptersdialog.cpp
@@ -18,7 +18,6 @@ ChaptersDialog::ChaptersDialog(Book *book, QWidget *parent): ListWindow(parent)
     list = new ListView;
     list->setSelectionMode(QAbstractItemView::SingleSelection);
     list->setModel(model);
-    list->setUniformItemSizes(true);
     addList(list);
     connect(list, SIGNAL(activated(const QModelIndex &)),
             this, SLOT(onItemActivated(const QModelIndex &)));

diff --git a/widgets/listview.cpp b/widgets/listview.cpp
index f8d43ed..409c584 100755 (executable)
--- a/widgets/listview.cpp
+++ b/widgets/listview.cpp
@@ -8,10 +8,6 @@ ListView::ListView(QWidget *parent): QListView(parent)
 #ifndef Q_OS_SYMBIAN\r
     setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);\r
 #endif\r
-#ifdef Q_OS_SYMBIAN_ONE_DAY\r
-    offset = 0;\r
-    Flickable::setAcceptMouseClick(this);\r
-#endif\r
     setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);\r
     setUniformItemSizes(true);\r
     setEditTriggers(QAbstractItemView::NoEditTriggers);\r
@@ -21,46 +17,3 @@ int ListView::contentsHeight() const
 {\r
     return QListView::contentsSize().height() + 10;\r
 }\r
-\r
-#ifdef Q_OS_SYMBIAN_ONE_DAY\r
-\r
-QPoint ListView::scrollOffset() const\r
-{\r
-    TRACE;\r
-    qDebug() << "0," << offset;\r
-    return QPoint(0, offset);\r
-}\r
-\r
-void ListView::setScrollOffset(const QPoint &o)\r
-{\r
-    TRACE;\r
-    qDebug() << o;\r
-    offset = o.y();\r
-    QListView::scrollContentsBy(0, offset)\r
-}\r
-\r
-void ListView::mousePressEvent(QMouseEvent *event)\r
-{\r
-    Flickable::handleMousePress(event);\r
-    if (!event->isAccepted()) {\r
-        QListView::mousePressEvent(event);\r
-    }\r
-}\r
-\r
-void ListView::mouseReleaseEvent(QMouseEvent *event)\r
-{\r
-    Flickable::handleMouseRelease(event);\r
-    if (!event->isAccepted()) {\r
-        QListView::mouseReleaseEvent(event);\r
-    }\r
-}\r
-\r
-void ListView::mouseMoveEvent(QMouseEvent *event)\r
-{\r
-    Flickable::handleMouseMove(event);\r
-    if (!event->isAccepted()) {\r
-        QListView::mouseMoveEvent(eveevent);\r
-    }\r
-}\r
-\r
-#endif // Q_OS_SYMBIAN_ONE_DAY\r

diff --git a/widgets/listview.h b/widgets/listview.h
index 49ef14a..8b9f2f1 100644 (file)
--- a/widgets/listview.h
+++ b/widgets/listview.h
@@ -3,35 +3,14 @@
 
 #include <QListView>
 
-#ifdef Q_OS_SYMBIAN_ONE_DAY
-#include "flickable.h"
-#endif
-
 /** Same as QListView, except contentsHeight() is public. */
 class ListView: public QListView
-#ifdef Q_OS_SYMBIAN_ONE_DAY
-        , public Flickable
-#endif
 {
     Q_OBJECT
 
 public:
     explicit ListView(QWidget *parent = 0);
     int contentsHeight() const;
-
-#ifdef Q_OS_SYMBIAN_ONE_DAY
-
-protected:
-    void mousePressEvent(QMouseEvent *event);
-    void mouseReleaseEvent(QMouseEvent *event);
-    void mouseMoveEvent(QMouseEvent *event);
-    QPoint scrollOffset() const;
-    void setScrollOffset(const QPoint &offset);
-
-private:
-    int offset;
-
-#endif // Q_OS_SYMBIAN_ONE_DAY
 };
 
 #endif // LISTVIEW_H