X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/e907e75abf2167417d2fa45c668df35b6dfdd094..961c3eef96a6370ca32488b9a9c5d63a7b166a90:/src/kcategorizedview.cpp

diff --git a/src/kcategorizedview.cpp b/src/kcategorizedview.cpp
index d0d51ef2f..20f9675f6 100644
--- a/src/kcategorizedview.cpp
+++ b/src/kcategorizedview.cpp
@@ -497,6 +497,7 @@ void KCategorizedView::setModel(QAbstractItemModel *model)
     {
         d->modelSortRole = d->proxyModel->sortRole();
         d->modelSortColumn = d->proxyModel->sortColumn();
+        d->modelCategorized = true;
         d->modelSortOrder = d->proxyModel->sortOrder();
 
         QObject::connect(d->proxyModel,
@@ -516,6 +517,10 @@ void KCategorizedView::setModel(QAbstractItemModel *model)
             rowsInsertedArtifficial(QModelIndex(), 0, d->proxyModel->rowCount() - 1);
         }
     }
+    else
+    {
+        d->modelCategorized = false;
+    }
 }
 
 QRect KCategorizedView::visualRect(const QModelIndex &index) const
@@ -589,7 +594,7 @@ void KCategorizedView::setCategoryDrawer(KCategoryDrawer *categoryDrawer)
     {
         if (d->proxyModel)
         {
-            rowsInserted(QModelIndex(), 0, d->proxyModel->rowCount() - 1);
+            rowsInsertedArtifficial(QModelIndex(), 0, d->proxyModel->rowCount() - 1);
         }
     }
     else
@@ -1254,25 +1259,24 @@ void KCategorizedView::rowsInsertedArtifficial(const QModelIndex &parent,
         return;
     }
 
-    // Add all elements mapped to the source model
-    for (int k = 0; k < d->proxyModel->rowCount(); k++)
-    {
-        d->biggestItemSize = QSize(qMax(sizeHintForIndex(d->proxyModel->index(k, 0)).width(),
-                                        d->biggestItemSize.width()),
-                                   qMax(sizeHintForIndex(d->proxyModel->index(k, 0)).height(),
-                                        d->biggestItemSize.height()));
-
-        d->modelIndexList << d->proxyModel->index(k, d->proxyModel->sortColumn());
-    }
-
-    // Explore categories
-    QString prevCategory = d->proxyModel->data(d->modelIndexList[0], KCategorizedSortFilterProxyModel::CategoryRole).toString();
+    // Add all elements mapped to the source model and explore categories
+    QString prevCategory = d->proxyModel->data(d->proxyModel->index(0, d->proxyModel->sortColumn()), KCategorizedSortFilterProxyModel::CategoryRole).toString();
     QString lastCategory = prevCategory;
     QModelIndexList modelIndexList;
     struct Private::ElementInfo elementInfo;
     int offset = -1;
-    foreach (const QModelIndex &index, d->modelIndexList)
+    for (int k = 0; k < d->proxyModel->rowCount(); ++k)
     {
+        QModelIndex index = d->proxyModel->index(k, d->proxyModel->sortColumn());
+        QModelIndex indexSize = d->proxyModel->index(k, 0);
+
+        d->biggestItemSize = QSize(qMax(sizeHintForIndex(indexSize).width(),
+                                        d->biggestItemSize.width()),
+                                   qMax(sizeHintForIndex(indexSize).height(),
+                                        d->biggestItemSize.height()));
+
+        d->modelIndexList << index;
+
         lastCategory = d->proxyModel->data(index, KCategorizedSortFilterProxyModel::CategoryRole).toString();
 
         elementInfo.category = lastCategory;
@@ -1335,15 +1339,22 @@ void KCategorizedView::slotLayoutChanged()
         d->categoryDrawer && d->proxyModel->isCategorizedModel() &&
         ((d->modelSortRole != d->proxyModel->sortRole()) ||
          (d->modelSortColumn != d->proxyModel->sortColumn()) ||
-         (d->modelSortOrder != d->proxyModel->sortOrder())))
+         (d->modelSortOrder != d->proxyModel->sortOrder()) ||
+         (d->modelCategorized != d->proxyModel->isCategorizedModel())))
     {
         // Force the view to update all elements
         rowsInsertedArtifficial(QModelIndex(), 0, d->proxyModel->rowCount() - 1);
 
         d->modelSortRole = d->proxyModel->sortRole();
         d->modelSortColumn = d->proxyModel->sortColumn();
+        d->modelCategorized = d->proxyModel->isCategorizedModel();
         d->modelSortOrder = d->proxyModel->sortOrder();
     }
+    else if ((viewMode() == KCategorizedView::IconMode) && d->proxyModel &&
+             d->categoryDrawer && d->proxyModel->isCategorizedModel())
+    {
+        d->updateScrollbars();
+    }
 }
 
 #include "kcategorizedview.moc"