From b60da9b67acbfe94e43bd631e4e685f366d53ec5 Mon Sep 17 00:00:00 2001 From: Peter Penz Date: Thu, 11 Dec 2008 20:27:05 +0000 Subject: [PATCH] as the detailsview and columnview can also have icon sizes up to 256 x 256 pixels, the steps when using the scrollwheel must be adjusted dynamically svn path=/trunk/KDE/kdebase/apps/; revision=895825 --- src/dolphincolumnwidget.cpp | 5 +++++ src/dolphindetailsview.cpp | 10 ++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/dolphincolumnwidget.cpp b/src/dolphincolumnwidget.cpp index 8edcf9a80..c552d70e1 100644 --- a/src/dolphincolumnwidget.cpp +++ b/src/dolphincolumnwidget.cpp @@ -46,6 +46,7 @@ #include #include #include +#include DolphinColumnWidget::DolphinColumnWidget(QWidget* parent, DolphinColumnView* columnView, @@ -420,6 +421,10 @@ void DolphinColumnWidget::wheelEvent(QWheelEvent* event) 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); } diff --git a/src/dolphindetailsview.cpp b/src/dolphindetailsview.cpp index 32deb873b..c81ec089c 100644 --- a/src/dolphindetailsview.cpp +++ b/src/dolphindetailsview.cpp @@ -169,11 +169,6 @@ bool DolphinDetailsView::event(QEvent* event) 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); @@ -419,7 +414,10 @@ void DolphinDetailsView::wheelEvent(QWheelEvent* event) 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); } -- 2.47.3