- Details view and column view: Just use the height as indicator for the scrolling...

- Icons view: Use slightly larger scrolling steps.

BUG: 191418
BUG: 192958

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

diff --git a/src/dolphincolumnview.cpp b/src/dolphincolumnview.cpp
index 26ebdc91d49f55ac1c3d5d253f762c1a00d1c3ad..8a1453ce15383a01985876f7bf1771a37bee4a10 100644 (file)
--- 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 476ed9a3b2d9a76d16e26e6dc05fb7374a15b4e8..5df10534068ebafd3ea2379418483b16b91e5457 100644 (file)
--- 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 a4e581fb4b9979b20aa944910a4466061e03eda4..a8188d9717e09fc0264df175cf2c164f0a775440 100644 (file)
--- 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