X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/bbf9faa05396d66b3dbe101a0c309459e3ffacb1..e8bc9f1072bfc43d7605315c8df69f37bfc71cc3:/src/dolphiniconsview.cpp

diff --git a/src/dolphiniconsview.cpp b/src/dolphiniconsview.cpp
index 30e47da89..ed2593c97 100644
--- a/src/dolphiniconsview.cpp
+++ b/src/dolphiniconsview.cpp
@@ -22,9 +22,9 @@
 #include "dolphincategorydrawer.h"
 #include "dolphincontroller.h"
 #include "dolphinsettings.h"
-
 #include "dolphin_iconsmodesettings.h"
 
+#include <kcategorizedsortfilterproxymodel.h>
 #include <kdialog.h>
 #include <kdirmodel.h>
 
@@ -45,6 +45,7 @@ DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controlle
     setViewMode(QListView::IconMode);
     setResizeMode(QListView::Adjust);
     setSpacing(KDialog::spacingHint());
+    setMovement(QListView::Snap);
     setMouseTracking(true);
     viewport()->setAttribute(Qt::WA_Hover);
 
@@ -137,6 +138,20 @@ QRect DolphinIconsView::visualRect(const QModelIndex& index) const
         itemRect.setHeight(maxHeight);
     }
 
+    KCategorizedSortFilterProxyModel* proxyModel = dynamic_cast<KCategorizedSortFilterProxyModel*>(model());
+    if (leftToRightFlow && !proxyModel->isCategorizedModel()) {
+        // TODO: This workaround bypasses a layout issue in QListView::visualRect(), where
+        // the horizontal position of items might get calculated in a wrong manner when the item
+        // name is too long. I'll try create a patch for Qt but as Dolphin must also work with
+        // Qt 4.3.0 this workaround must get applied at least for KDE 4.0.
+        const IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings();
+        const int margin = settings->gridSpacing() / 2;
+        const int gridWidth = gridSize().width();
+        int left = itemRect.left();
+        left = ((left - margin + 1) / gridWidth) * gridWidth + margin;
+        itemRect.moveLeft(left);
+    }
+
     return itemRect;
 }
 
@@ -188,7 +203,11 @@ void DolphinIconsView::dragMoveEvent(QDragMoveEvent* event)
     // TODO: remove this code when the issue #160611 is solved in Qt 4.4
     const QModelIndex index = indexAt(event->pos());
     setDirtyRegion(m_dropRect);
-    m_dropRect = visualRect(index);
+    if (itemForIndex(index).isDir()) {
+        m_dropRect = visualRect(index);
+    } else {
+        m_dropRect.setSize(QSize()); // set as invalid
+    }
     setDirtyRegion(m_dropRect);
 }
 
@@ -198,14 +217,11 @@ void DolphinIconsView::dropEvent(QDropEvent* event)
         const KUrl::List urls = KUrl::List::fromMimeData(event->mimeData());
         if (!urls.isEmpty()) {
             const QModelIndex index = indexAt(event->pos());
-            if (index.isValid()) {
-                const KFileItem item = itemForIndex(index);
-                m_controller->indicateDroppedUrls(urls,
-                                                  m_controller->url(),
-                                                  item,
-                                                  event->source());
-                event->acceptProposedAction();
-            }
+            const KFileItem item = itemForIndex(index);
+            m_controller->indicateDroppedUrls(urls,
+                                              m_controller->url(),
+                                              item);
+            event->acceptProposedAction();
         }
     }