Fix issue that the sort proxy model does not work for QTreeView and QColumnView ...

[dolphin.git] / src / dolphindetailsview.cpp

diff --git a/src/dolphindetailsview.cpp b/src/dolphindetailsview.cpp
index 7737799768dea4ad7d7b927d032029a2a9f14d14..dc05ef3ea3627d6cf8df73501dfcb47c2b4deaa2 100644 (file)
--- a/src/dolphindetailsview.cpp
+++ b/src/dolphindetailsview.cpp
@@ -43,6 +43,8 @@ DolphinDetailsView::DolphinDetailsView(QWidget* parent, DolphinController* contr
     setSortingEnabled(true);
     setUniformRowHeights(true);
     setSelectionBehavior(SelectItems);
+    setDragDropMode(QAbstractItemView::DragDrop);
+    setDropIndicatorShown(false);
 
     viewport()->setAttribute(Qt::WA_Hover);
 
@@ -73,11 +75,13 @@ DolphinDetailsView::DolphinDetailsView(QWidget* parent, DolphinController* contr
     Q_ASSERT(settings != 0);
 
     m_viewOptions = QTreeView::viewOptions();
-    m_viewOptions.font = QFont(settings->fontFamily(), settings->fontSize());
-    updateDecorationSize();
 
-    KFileItemDelegate* delegate = new KFileItemDelegate(parent);
-    setItemDelegate(delegate);
+    QFont font(settings->fontFamily(), settings->fontSize());
+    font.setItalic(settings->italicFont());
+    font.setBold(settings->boldFont());
+    m_viewOptions.font = font;
+
+    updateDecorationSize();
 }
 
 DolphinDetailsView::~DolphinDetailsView()
@@ -145,13 +149,13 @@ void DolphinDetailsView::dragEnterEvent(QDragEnterEvent* event)
 void DolphinDetailsView::dropEvent(QDropEvent* event)
 {
     const KUrl::List urls = KUrl::List::fromMimeData(event->mimeData());
-    if (urls.isEmpty() || (event->source() == this)) {
-        QTreeView::dropEvent(event);
-    }
-    else {
+    if (!urls.isEmpty()) {
         event->acceptProposedAction();
-        m_controller->indicateDroppedUrls(urls, event->pos());
+        m_controller->indicateDroppedUrls(urls,
+                                          indexAt(event->pos()),
+                                          event->source());
     }
+    QTreeView::dropEvent(event);
 }
 
 void DolphinDetailsView::setSortIndicatorSection(DolphinView::Sorting sorting)