Merge remote-tracking branch 'fork/work/zakharafoniam/useful-groups'

[dolphin.git] / src / kitemviews / kfileitemlistview.cpp

diff --git a/src/kitemviews/kfileitemlistview.cpp b/src/kitemviews/kfileitemlistview.cpp
index 954e6ab881ada04f009d328659808884d0920c8d..d58a1a8baf3ac982d82135f1ed1ba55a2ae41404 100644 (file)
--- a/src/kitemviews/kfileitemlistview.cpp
+++ b/src/kitemviews/kfileitemlistview.cpp
@@ -9,6 +9,7 @@
 #include "kfileitemlistwidget.h"
 #include "kfileitemmodel.h"
 #include "kfileitemmodelrolesupdater.h"
 #include "kfileitemlistwidget.h"
 #include "kfileitemmodel.h"
 #include "kfileitemmodelrolesupdater.h"

+#include "private/kitemviewsutils.h"

 #include "private/kpixmapmodifier.h"
 
 #include <KIconLoader>
 #include "private/kpixmapmodifier.h"
 
 #include <KIconLoader>


@@ -157,7 +158,7 @@ QPixmap KFileItemListView::createDragPixmap(const KItemSet &indexes) const
         yCount = xCount;
     }
 
         yCount = xCount;
     }
 

-    const qreal dpr = scene()->views()[0]->devicePixelRatio();
+    const qreal dpr = KItemViewsUtils::devicePixelRatio(this);

     // Draw the selected items into the grid cells.
     QPixmap dragPixmap(QSize(xCount * size + xCount, yCount * size + yCount) * dpr);
     dragPixmap.setDevicePixelRatio(dpr);
     // Draw the selected items into the grid cells.
     QPixmap dragPixmap(QSize(xCount * size + xCount, yCount * size + yCount) * dpr);
     dragPixmap.setDevicePixelRatio(dpr);


@@ -255,6 +256,7 @@ void KFileItemListView::onModelChanged(KItemModelBase *current, KItemModelBase *
     if (current) {
         m_modelRolesUpdater = new KFileItemModelRolesUpdater(static_cast<KFileItemModel *>(current), this);
         m_modelRolesUpdater->setIconSize(availableIconSize());
     if (current) {
         m_modelRolesUpdater = new KFileItemModelRolesUpdater(static_cast<KFileItemModel *>(current), this);
         m_modelRolesUpdater->setIconSize(availableIconSize());

+        m_modelRolesUpdater->setDevicePixelRatio(KItemViewsUtils::devicePixelRatio(this));

 
         applyRolesToModel();
     }
 
         applyRolesToModel();
     }


@@ -414,6 +416,7 @@ void KFileItemListView::updateIconSize()
     }
 
     m_modelRolesUpdater->setIconSize(availableIconSize());
     }
 
     m_modelRolesUpdater->setIconSize(availableIconSize());

+    m_modelRolesUpdater->setDevicePixelRatio(KItemViewsUtils::devicePixelRatio(this));

 
     // Update the visible index range (which has most likely changed after the
     // icon size change) before unpausing m_modelRolesUpdater.
 
     // Update the visible index range (which has most likely changed after the
     // icon size change) before unpausing m_modelRolesUpdater.


@@ -449,8 +452,9 @@ void KFileItemListView::applyRolesToModel()
         roles.insert("expandedParentsCount");
     }
 
         roles.insert("expandedParentsCount");
     }
 

-    // Assure that the role that is used for sorting will be determined
+    // Assure that the roles used for sorting and grouping will be determined

     roles.insert(fileItemModel->sortRole());
     roles.insert(fileItemModel->sortRole());

+    roles.insert(fileItemModel->groupRole());

 
     fileItemModel->setRoles(roles);
     m_modelRolesUpdater->setRoles(roles);
 
     fileItemModel->setRoles(roles);
     m_modelRolesUpdater->setRoles(roles);