as the detailsview and columnview can also have icon sizes up to 256 x 256 pixels...

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

diff --git a/src/dolphincolumnwidget.cpp b/src/dolphincolumnwidget.cpp
index 8edcf9a803ce00886a78de7d08a27fabc91eaa85..c552d70e120da56d1208fcc0e1d8826f2d48eb16 100644 (file)
--- a/src/dolphincolumnwidget.cpp
+++ b/src/dolphincolumnwidget.cpp
@@ -46,6 +46,7 @@
 #include <QClipboard>
 #include <QPainter>
 #include <QPoint>
 #include <QClipboard>
 #include <QPainter>
 #include <QPoint>

+#include <QScrollBar>

 
 DolphinColumnWidget::DolphinColumnWidget(QWidget* parent,
                                          DolphinColumnView* columnView,
 
 DolphinColumnWidget::DolphinColumnWidget(QWidget* parent,
                                          DolphinColumnView* columnView,


@@ -420,6 +421,10 @@ void DolphinColumnWidget::wheelEvent(QWheelEvent* event)
         event->ignore();
         return;
     }
         event->ignore();
         return;
     }

+    
+    const int height = m_decorationSize.height();
+    const int step = (height >= KIconLoader::SizeHuge) ? height / 10 : (KIconLoader::SizeHuge - height) / 2;
+    verticalScrollBar()->setSingleStep(step);

 
     QListView::wheelEvent(event);
 }
 
     QListView::wheelEvent(event);
 }

diff --git a/src/dolphindetailsview.cpp b/src/dolphindetailsview.cpp
index 32deb873b22233a93e04a77984c5fa4fdfb099a1..c81ec089c9d7d87335d44a42b5aa9b0cc2c497ab 100644 (file)
--- a/src/dolphindetailsview.cpp
+++ b/src/dolphindetailsview.cpp
@@ -169,11 +169,6 @@ bool DolphinDetailsView::event(QEvent* event)
 
         hideColumn(DolphinModel::Rating);
         hideColumn(DolphinModel::Tags);
 
         hideColumn(DolphinModel::Rating);
         hideColumn(DolphinModel::Tags);

-    } else if (event->type() == QEvent::UpdateRequest) {
-        // a wheel movement will scroll 4 items
-        if (model()->rowCount() > 0) {
-            verticalScrollBar()->setSingleStep((sizeHintForRow(0) / 3) * 4);
-        }

     }
 
     return QTreeView::event(event);
     }
 
     return QTreeView::event(event);


@@ -419,7 +414,10 @@ void DolphinDetailsView::wheelEvent(QWheelEvent* event)
         event->ignore();
         return;
     }
         event->ignore();
         return;
     }

-
+    
+    const int height = m_decorationSize.height();
+    const int step = (height >= KIconLoader::SizeHuge) ? height / 10 : (KIconLoader::SizeHuge - height) / 2;
+    verticalScrollBar()->setSingleStep(step);

     QTreeView::wheelEvent(event);
 }
 
     QTreeView::wheelEvent(event);
 }