X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/f5deeadebbb67b4b20eae13f55e0ef66f4127eea..f0e54ea52b3934bbb64b4d43a8c7dcdfd6b50de7:/src/dolphindetailsview.cpp

diff --git a/src/dolphindetailsview.cpp b/src/dolphindetailsview.cpp
index 1bf5f75e0..5df105340 100644
--- a/src/dolphindetailsview.cpp
+++ b/src/dolphindetailsview.cpp
@@ -171,6 +171,21 @@ QSet<KUrl> DolphinDetailsView::expandedUrls() const
     return m_expandedUrls;
 }
 
+QRegion DolphinDetailsView::visualRegionForSelection(const QItemSelection &selection) const
+{
+    // We have to make sure that the visualRect of each model index is inside the region.
+    // QTreeView::visualRegionForSelection does not do it right because it assumes implicitly
+    // that all visualRects have the same width, which is in general not the case here.
+    QRegion selectionRegion;
+    const QModelIndexList indexes = selection.indexes();
+
+    foreach(const QModelIndex& index, indexes) {
+        selectionRegion += visualRect(index);
+    }
+
+    return selectionRegion;
+}
+
 bool DolphinDetailsView::event(QEvent* event)
 {
     if (event->type() == QEvent::Polish) {
@@ -185,6 +200,7 @@ QStyleOptionViewItem DolphinDetailsView::viewOptions() const
 {
     QStyleOptionViewItem viewOptions = QTreeView::viewOptions();
     viewOptions.font = m_font;
+    viewOptions.fontMetrics = QFontMetrics(m_font);
     viewOptions.showDecorationSelected = true;
     viewOptions.decorationSize = m_decorationSize;
     return viewOptions;
@@ -410,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);
 }