From 02e2ef207d60098708de5ef77847e4cd1ca08397 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rafael=20Fern=C3=A1ndez=20L=C3=B3pez?= Date: Thu, 4 Oct 2007 15:15:24 +0000 Subject: [PATCH] Let's do this in a safe way while we wait for the release team to reply telling if we make Qt 4.3.2 a requirement for KDE 4.0 svn path=/trunk/KDE/kdebase/apps/; revision=721096 --- src/dolphindetailsview.cpp | 16 ++++++++++++++-- src/sidebartreeview.cpp | 13 +++++++++++++ 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/src/dolphindetailsview.cpp b/src/dolphindetailsview.cpp index d5b14783b..c26d3d5b5 100644 --- a/src/dolphindetailsview.cpp +++ b/src/dolphindetailsview.cpp @@ -108,8 +108,14 @@ DolphinDetailsView::DolphinDetailsView(QWidget* parent, DolphinController* contr m_viewOptions.font = font; m_viewOptions.showDecorationSelected = true; - setVerticalScrollMode(QListView::ScrollPerPixel); - setHorizontalScrollMode(QListView::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)) + setVerticalScrollMode(QTreeView::ScrollPerPixel); + setHorizontalScrollMode(QTreeView::ScrollPerPixel); +#endif updateDecorationSize(); } @@ -156,12 +162,18 @@ bool DolphinDetailsView::event(QEvent* event) hideColumn(DolphinModel::Rating); hideColumn(DolphinModel::Tags); } +// 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)) else if (event->type() == QEvent::UpdateRequest) { // a wheel movement will scroll 4 items if (model()->rowCount() > 0) { verticalScrollBar()->setSingleStep((sizeHintForRow(0) / 3) * 4); } } +#endif return QTreeView::event(event); } diff --git a/src/sidebartreeview.cpp b/src/sidebartreeview.cpp index 52f207a78..2316c5d6e 100644 --- a/src/sidebartreeview.cpp +++ b/src/sidebartreeview.cpp @@ -41,8 +41,15 @@ SidebarTreeView::SidebarTreeView(QWidget* parent) : setDragDropMode(QAbstractItemView::DragDrop); setDropIndicatorShown(false); setAutoExpandDelay(300); + +// 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)) setVerticalScrollMode(QListView::ScrollPerPixel); setHorizontalScrollMode(QListView::ScrollPerPixel); +#endif viewport()->setAttribute(Qt::WA_Hover); @@ -72,12 +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)) 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); } -- 2.47.3