X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/c364f1b47ab4a3f95d246cc433fad6a68939312a..b5eca6dc2aaa6f90d7dc2fe27ab9ccc45aee77f2:/src/sidebartreeview.cpp

diff --git a/src/sidebartreeview.cpp b/src/sidebartreeview.cpp
index 4d8c2cc56..ae6c26224 100644
--- a/src/sidebartreeview.cpp
+++ b/src/sidebartreeview.cpp
@@ -26,6 +26,7 @@
 #include <QKeyEvent>
 #include <QPainter>
 #include <QHeaderView>
+#include <QScrollBar>
 
 SidebarTreeView::SidebarTreeView(QWidget* parent) :
     QTreeView(parent),
@@ -40,11 +41,15 @@ SidebarTreeView::SidebarTreeView(QWidget* parent) :
     setDragDropMode(QAbstractItemView::DragDrop);
     setDropIndicatorShown(false);
     setAutoExpandDelay(300);
-    // TODO: enable ScrollPerPixel again as soon as a Qt-patch
-    // is supplied which fixes a possible crash
-    // (see http://lists.kde.org/?l=kde-core-devel&m=119077433611662&w=2)
-    //setHorizontalScrollMode(QAbstractItemView::ScrollPerPixel);
-    //setVerticalScrollMode(QAbstractItemView::ScrollPerPixel);
+
+// TODO: Remove this check when 4.3.2 is released and KDE requires it... this
+//       check avoids a division by zero happening on versions before 4.3.1.
+//       Right now KDE in theory can be shipped with Qt 4.3.0 and above.
+//       ereslibre
+#if (QT_VERSION >= QT_VERSION_CHECK(4, 3, 2) || defined(QT_KDE_QT_COPY))
+    setVerticalScrollMode(QListView::ScrollPerPixel);
+    setHorizontalScrollMode(QListView::ScrollPerPixel);
+#endif
 
     viewport()->setAttribute(Qt::WA_Hover);
 
@@ -74,6 +79,18 @@ bool SidebarTreeView::event(QEvent* event)
         hideColumn(DolphinModel::Tags);
         header()->hide();
     }
+// TODO: Remove this check when 4.3.2 is released and KDE requires it... this
+//       check avoids a division by zero happening on versions before 4.3.1.
+//       Right now KDE in theory can be shipped with Qt 4.3.0 and above.
+//       ereslibre
+#if (QT_VERSION >= QT_VERSION_CHECK(4, 3, 2) || defined(QT_KDE_QT_COPY))
+    else if (event->type() == QEvent::UpdateRequest) {
+        // a wheel movement will scroll 1 item
+        if (model()->rowCount() > 0) {
+            verticalScrollBar()->setSingleStep(sizeHintForRow(0) / 3);
+        }
+    }
+#endif
 
     return QTreeView::event(event);
 }