diff options
| author | Rafael Fernández López <[email protected]> | 2007-10-04 15:15:24 +0000 |
|---|---|---|
| committer | Rafael Fernández López <[email protected]> | 2007-10-04 15:15:24 +0000 |
| commit | 02e2ef207d60098708de5ef77847e4cd1ca08397 (patch) | |
| tree | 5f1f27dc16fb8c17faa5c67d96e282e36ab5689f | |
| parent | 8d3684162f78b489701ac00e252f961af1b47a77 (diff) | |
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
| -rw-r--r-- | src/dolphindetailsview.cpp | 16 | ||||
| -rw-r--r-- | 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); } |
