Bypass a layout issue in QListView::visualRect(), where the horizontal position of...

BUG: 152293

svn path=/trunk/KDE/kdebase/apps/; revision=737265

diff --git a/src/dolphiniconsview.cpp b/src/dolphiniconsview.cpp
index eb3aa13c6d2fb18bb6bb2ab1a968b7f889658586..ed2593c97a0759e45f383d3ebe90af4dcda72ecb 100644 (file)
--- a/src/dolphiniconsview.cpp
+++ b/src/dolphiniconsview.cpp
@@ -22,9 +22,9 @@
 #include "dolphincategorydrawer.h"
 #include "dolphincontroller.h"
 #include "dolphinsettings.h"
 #include "dolphincategorydrawer.h"
 #include "dolphincontroller.h"
 #include "dolphinsettings.h"

-

 #include "dolphin_iconsmodesettings.h"
 
 #include "dolphin_iconsmodesettings.h"
 

+#include <kcategorizedsortfilterproxymodel.h>

 #include <kdialog.h>
 #include <kdirmodel.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());
     setViewMode(QListView::IconMode);
     setResizeMode(QListView::Adjust);
     setSpacing(KDialog::spacingHint());

+    setMovement(QListView::Snap);

     setMouseTracking(true);
     viewport()->setAttribute(Qt::WA_Hover);
 
     setMouseTracking(true);
     viewport()->setAttribute(Qt::WA_Hover);
 


@@ -137,6 +138,20 @@ QRect DolphinIconsView::visualRect(const QModelIndex& index) const
         itemRect.setHeight(maxHeight);
     }
 
         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;
 }
 
     return itemRect;
 }