- Details view and column view: Just use the height as indicator for the scrolling steps when using the wheel. Don't decrease the steps for larger icon sizes.

- Icons view: Use slightly larger scrolling steps.

BUG: 191418
BUG: 192958

svn path=/trunk/KDE/kdebase/apps/; revision=1070438

3 files changed, 4 insertions, 7 deletions

diff --git a/src/dolphincolumnview.cpp b/src/dolphincolumnview.cpp
index 26ebdc91d..8a1453ce1 100644
--- a/src/dolphincolumnview.cpp
+++ b/src/dolphincolumnview.cpp
@@ -333,10 +333,8 @@ void DolphinColumnView::contextMenuEvent(QContextMenuEvent* event)
 
 void DolphinColumnView::wheelEvent(QWheelEvent* event)
 {
-    const int height = m_decorationSize.height();
-    const int step = (height >= KIconLoader::SizeHuge) ? height / 10 : (KIconLoader::SizeHuge - height) / 2;
+    const int step = m_decorationSize.height();
     verticalScrollBar()->setSingleStep(step);
-
     QListView::wheelEvent(event);
 }
 
diff --git a/src/dolphindetailsview.cpp b/src/dolphindetailsview.cpp
index 476ed9a3b..5df105340 100644
--- a/src/dolphindetailsview.cpp
+++ b/src/dolphindetailsview.cpp
@@ -426,8 +426,7 @@ void DolphinDetailsView::resizeEvent(QResizeEvent* event)
 
 void DolphinDetailsView::wheelEvent(QWheelEvent* event)
 {
-    const int height = m_decorationSize.height();
-    const int step = (height >= KIconLoader::SizeHuge) ? height / 10 : (KIconLoader::SizeHuge - height) / 2;
+    const int step = m_decorationSize.height();
     verticalScrollBar()->setSingleStep(step);
     QTreeView::wheelEvent(event);
 }
diff --git a/src/dolphiniconsview.cpp b/src/dolphiniconsview.cpp
index a4e581fb4..a8188d971 100644
--- a/src/dolphiniconsview.cpp
+++ b/src/dolphiniconsview.cpp
@@ -319,8 +319,8 @@ void DolphinIconsView::keyPressEvent(QKeyEvent* event)
 
 void DolphinIconsView::wheelEvent(QWheelEvent* event)
 {
-    horizontalScrollBar()->setSingleStep(m_itemSize.width() / 10);
-    verticalScrollBar()->setSingleStep(m_itemSize.height() / 10);
+    horizontalScrollBar()->setSingleStep(m_itemSize.width() / 5);
+    verticalScrollBar()->setSingleStep(m_itemSize.height() / 5);
 
     KCategorizedView::wheelEvent(event);
     // if the icons are aligned left to right, the vertical wheel event should