X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/85aec92f819eae5a6189bd3ec25cff44dce3ae19..b1c9b5126d:/src/dolphinviewautoscroller.cpp

diff --git a/src/dolphinviewautoscroller.cpp b/src/dolphinviewautoscroller.cpp
index b99bbc749..2a57cc157 100644
--- a/src/dolphinviewautoscroller.cpp
+++ b/src/dolphinviewautoscroller.cpp
@@ -30,13 +30,13 @@
 DolphinViewAutoScroller::DolphinViewAutoScroller(QAbstractItemView* parent) :
     QObject(parent),
     m_rubberBandSelection(false),
-    m_scrollInc(0),
+    m_horizontalScrollInc(0),
+    m_verticalScrollInc(0),
     m_itemView(parent),
     m_timer()
 {
     m_itemView->setAutoScroll(false);
     m_itemView->viewport()->installEventFilter(this);
-    m_itemView->installEventFilter(this);
 
     m_timer = new QTimer(this);
     m_timer->setSingleShot(false);
@@ -48,6 +48,11 @@ DolphinViewAutoScroller::~DolphinViewAutoScroller()
 {
 }
 
+bool DolphinViewAutoScroller::isActive() const
+{
+    return m_timer->isActive();
+}
+
 bool DolphinViewAutoScroller::eventFilter(QObject* watched, QEvent* event)
 {
     if (watched == m_itemView->viewport()) {
@@ -84,24 +89,8 @@ bool DolphinViewAutoScroller::eventFilter(QObject* watched, QEvent* event)
         default:
             break;
         }
-    } else if ((watched == m_itemView) && (event->type() == QEvent::KeyPress)) {
-        switch (static_cast<QKeyEvent*>(event)->key()) {
-        case Qt::Key_Up:
-        case Qt::Key_Down:
-        case Qt::Key_Left:
-        case Qt::Key_Right:
-        case Qt::Key_PageUp:
-        case Qt::Key_PageDown:
-        case Qt::Key_Home:
-        case Qt::Key_End:
-            QMetaObject::invokeMethod(this, "scrollToCurrentIndex", Qt::QueuedConnection);
-            break;
-        default:
-            break;
-        }
     }
 
-
     return QObject::eventFilter(watched, event);
 }
 
@@ -110,13 +99,13 @@ void DolphinViewAutoScroller::scrollViewport()
     QScrollBar* verticalScrollBar = m_itemView->verticalScrollBar();
     if (verticalScrollBar != 0) {
         const int value = verticalScrollBar->value();
-        verticalScrollBar->setValue(value + m_scrollInc);
+        verticalScrollBar->setValue(value + m_verticalScrollInc);
 
     }
     QScrollBar* horizontalScrollBar = m_itemView->horizontalScrollBar();
     if (horizontalScrollBar != 0) {
         const int value = horizontalScrollBar->value();
-        horizontalScrollBar->setValue(value + m_scrollInc);
+        horizontalScrollBar->setValue(value + m_horizontalScrollInc);
 
     }
 
@@ -131,16 +120,10 @@ void DolphinViewAutoScroller::scrollViewport()
     }
 }
 
-void DolphinViewAutoScroller::scrollToCurrentIndex()
-{
-     const QModelIndex index = m_itemView->currentIndex();
-     m_itemView->scrollTo(index);
-}
-
 void DolphinViewAutoScroller::triggerAutoScroll()
 {
     const bool verticalScrolling = (m_itemView->verticalScrollBar() != 0) &&
-                                    m_itemView->verticalScrollBar()->isVisible();
+                                   m_itemView->verticalScrollBar()->isVisible();
     const bool horizontalScrolling = (m_itemView->horizontalScrollBar() != 0) &&
                                      m_itemView->horizontalScrollBar()->isVisible();
     if (!verticalScrolling && !horizontalScrolling) {
@@ -151,17 +134,17 @@ void DolphinViewAutoScroller::triggerAutoScroll()
     QWidget* viewport = m_itemView->viewport();
     const QPoint pos = viewport->mapFromGlobal(QCursor::pos());
     if (verticalScrolling) {
-        calculateScrollIncrement(pos.y(), viewport->height());
+        m_verticalScrollInc = calculateScrollIncrement(pos.y(), viewport->height());
     }
     if (horizontalScrolling) {
-        calculateScrollIncrement(pos.x(), viewport->width());
+        m_horizontalScrollInc = calculateScrollIncrement(pos.x(), viewport->width());
     }
 
     if (m_timer->isActive()) {
-        if (m_scrollInc == 0) {
+        if ((m_horizontalScrollInc == 0) && (m_verticalScrollInc == 0)) {
             m_timer->stop();
         }
-    } else if (m_scrollInc != 0) {
+    } else if ((m_horizontalScrollInc != 0) || (m_verticalScrollInc != 0)) {
         m_timer->start();
     }
 }
@@ -169,29 +152,32 @@ void DolphinViewAutoScroller::triggerAutoScroll()
 void DolphinViewAutoScroller::stopAutoScroll()
 {
     m_timer->stop();
-    m_scrollInc = 0;
+    m_horizontalScrollInc = 0;
+    m_verticalScrollInc = 0;
 }
 
-void DolphinViewAutoScroller::calculateScrollIncrement(int cursorPos, int rangeSize)
+int DolphinViewAutoScroller::calculateScrollIncrement(int cursorPos, int rangeSize) const
 {
+    int inc = 0;
+
     const int minSpeed = 2;
     const int maxSpeed = 32;
     const int speedLimiter = 8;
     const int autoScrollBorder = 32;
 
     if (cursorPos < autoScrollBorder) {
-        m_scrollInc = -minSpeed + (cursorPos - autoScrollBorder) / speedLimiter;
-        if (m_scrollInc < -maxSpeed) {
-            m_scrollInc = -maxSpeed;
+        inc = -minSpeed + (cursorPos - autoScrollBorder) / speedLimiter;
+        if (inc < -maxSpeed) {
+            inc = -maxSpeed;
         }
     } else if (cursorPos > rangeSize - autoScrollBorder) {
-        m_scrollInc = minSpeed + (cursorPos - rangeSize + autoScrollBorder) / speedLimiter;
-        if (m_scrollInc > maxSpeed) {
-            m_scrollInc = maxSpeed;
+        inc = minSpeed + (cursorPos - rangeSize + autoScrollBorder) / speedLimiter;
+        if (inc > maxSpeed) {
+            inc = maxSpeed;
         }
-    } else {
-        m_scrollInc = 0;
     }
+
+    return inc;
 }
 
 #include "dolphinviewautoscroller.moc"