Fix selection rect after porting from QFontMetrics::width()

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

diff --git a/src/kitemviews/kfileitemlistview.cpp b/src/kitemviews/kfileitemlistview.cpp
index 0a92e75e5ff13ee60df11568ca645958bad20a4c..4fffbcbfd208bebc17b5a0b33eb76a1e84b82c55 100644 (file)
--- a/src/kitemviews/kfileitemlistview.cpp
+++ b/src/kitemviews/kfileitemlistview.cpp
@@ -19,43 +19,38 @@
 
 #include "kfileitemlistview.h"
 
 
 #include "kfileitemlistview.h"
 

-#include "kfileitemmodelrolesupdater.h"

 #include "kfileitemlistwidget.h"
 #include "kfileitemmodel.h"
 #include "kfileitemlistwidget.h"
 #include "kfileitemmodel.h"

-#include <KLocale>
-#include <KStringHandler>
+#include "kfileitemmodelrolesupdater.h"

 #include "private/kpixmapmodifier.h"
 
 #include "private/kpixmapmodifier.h"
 

-#include <KDebug>
-#include <KIcon>
-#include <KTextEdit>

 #include <KIconLoader>
 #include <KIconLoader>

-#include <KDateTime>

 
 

+#include <QGraphicsScene>
+#include <QGraphicsView>

 #include <QPainter>
 #include <QPainter>

-#include <QTextLine>

 #include <QTimer>
 
 // #define KFILEITEMLISTVIEW_DEBUG
 
 namespace {
     // If the visible index range changes, KFileItemModelRolesUpdater is not
 #include <QTimer>
 
 // #define KFILEITEMLISTVIEW_DEBUG
 
 namespace {
     // If the visible index range changes, KFileItemModelRolesUpdater is not

-    // informed immediatetly, but with a short delay. This ensures that scrolling
+    // informed immediately, but with a short delay. This ensures that scrolling

     // always feels smooth and is not interrupted by icon loading (which can be
     // quite expensive if a disk access is required to determine the final icon).
     const int ShortInterval = 50;
 
     // If the icon size changes, a longer delay is used. This prevents that
     // the expensive re-generation of all previews is triggered repeatedly when
     // always feels smooth and is not interrupted by icon loading (which can be
     // quite expensive if a disk access is required to determine the final icon).
     const int ShortInterval = 50;
 
     // If the icon size changes, a longer delay is used. This prevents that
     // the expensive re-generation of all previews is triggered repeatedly when

-    // chaning the zoom level.
+    // changing the zoom level.

     const int LongInterval = 300;
 }
 
 KFileItemListView::KFileItemListView(QGraphicsWidget* parent) :
     KStandardItemListView(parent),
     const int LongInterval = 300;
 }
 
 KFileItemListView::KFileItemListView(QGraphicsWidget* parent) :
     KStandardItemListView(parent),

-    m_modelRolesUpdater(0),
-    m_updateVisibleIndexRangeTimer(0),
-    m_updateIconSizeTimer(0)
+    m_modelRolesUpdater(nullptr),
+    m_updateVisibleIndexRangeTimer(nullptr),
+    m_updateIconSizeTimer(nullptr)

 {
     setAcceptDrops(true);
 
 {
     setAcceptDrops(true);
 


@@ -71,7 +66,7 @@ KFileItemListView::KFileItemListView(QGraphicsWidget* parent) :
     m_updateIconSizeTimer->setInterval(LongInterval);
     connect(m_updateIconSizeTimer, &QTimer::timeout, this, &KFileItemListView::updateIconSize);
 
     m_updateIconSizeTimer->setInterval(LongInterval);
     connect(m_updateIconSizeTimer, &QTimer::timeout, this, &KFileItemListView::updateIconSize);
 

-    setVisibleRoles(QList<QByteArray>() << "text");
+    setVisibleRoles({"text"});

 }
 
 KFileItemListView::~KFileItemListView()
 }
 
 KFileItemListView::~KFileItemListView()


@@ -121,6 +116,18 @@ QStringList KFileItemListView::enabledPlugins() const
     return m_modelRolesUpdater ? m_modelRolesUpdater->enabledPlugins() : QStringList();
 }
 
     return m_modelRolesUpdater ? m_modelRolesUpdater->enabledPlugins() : QStringList();
 }
 

+void KFileItemListView::setLocalFileSizePreviewLimit(const qlonglong size)
+{
+    if (m_modelRolesUpdater) {
+        m_modelRolesUpdater->setLocalFileSizePreviewLimit(size);
+    }
+}
+
+qlonglong KFileItemListView::localFileSizePreviewLimit() const
+{
+    return m_modelRolesUpdater ? m_modelRolesUpdater->localFileSizePreviewLimit() : 0;
+}
+

 QPixmap KFileItemListView::createDragPixmap(const KItemSet& indexes) const
 {
     if (!model()) {
 QPixmap KFileItemListView::createDragPixmap(const KItemSet& indexes) const
 {
     if (!model()) {


@@ -160,21 +167,23 @@ QPixmap KFileItemListView::createDragPixmap(const KItemSet& indexes) const
         yCount = xCount;
     }
 
         yCount = xCount;
     }
 

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

     // Draw the selected items into the grid cells.
     // Draw the selected items into the grid cells.

-    QPixmap dragPixmap(xCount * size + xCount, yCount * size + yCount);
+    QPixmap dragPixmap(QSize(xCount * size + xCount, yCount * size + yCount) * dpr);
+    dragPixmap.setDevicePixelRatio(dpr);

     dragPixmap.fill(Qt::transparent);
 
     QPainter painter(&dragPixmap);
     int x = 0;
     int y = 0;
 
     dragPixmap.fill(Qt::transparent);
 
     QPainter painter(&dragPixmap);
     int x = 0;
     int y = 0;
 

-    foreach (int index, indexes) {
+    for (int index : indexes) {

         QPixmap pixmap = model()->data(index).value("iconPixmap").value<QPixmap>();
         if (pixmap.isNull()) {
         QPixmap pixmap = model()->data(index).value("iconPixmap").value<QPixmap>();
         if (pixmap.isNull()) {

-            KIcon icon(model()->data(index).value("iconName").toString());
+            QIcon icon = QIcon::fromTheme(model()->data(index).value("iconName").toString());

             pixmap = icon.pixmap(size, size);
         } else {
             pixmap = icon.pixmap(size, size);
         } else {

-            KPixmapModifier::scale(pixmap, QSize(size, size));
+            KPixmapModifier::scale(pixmap, QSize(size, size) * dpr);

         }
 
         painter.drawPixmap(x, y, pixmap);
         }
 
         painter.drawPixmap(x, y, pixmap);


@@ -210,13 +219,13 @@ void KFileItemListView::initializeItemListWidget(KItemListWidget* item)
 
         const KFileItem fileItem = fileItemModel->fileItem(item->index());
         data.insert("iconName", fileItem.iconName());
 
         const KFileItem fileItem = fileItemModel->fileItem(item->index());
         data.insert("iconName", fileItem.iconName());

-        item->setData(data, QSet<QByteArray>() << "iconName");
+        item->setData(data, {"iconName"});

     }
 }
 
 void KFileItemListView::onPreviewsShownChanged(bool shown)
 {
     }
 }
 
 void KFileItemListView::onPreviewsShownChanged(bool shown)
 {

-    Q_UNUSED(shown);
+    Q_UNUSED(shown)

 }
 
 void KFileItemListView::onItemLayoutChanged(ItemLayout current, ItemLayout previous)
 }
 
 void KFileItemListView::onItemLayoutChanged(ItemLayout current, ItemLayout previous)


@@ -231,7 +240,7 @@ void KFileItemListView::onModelChanged(KItemModelBase* current, KItemModelBase*
     KStandardItemListView::onModelChanged(current, previous);
 
     delete m_modelRolesUpdater;
     KStandardItemListView::onModelChanged(current, previous);
 
     delete m_modelRolesUpdater;

-    m_modelRolesUpdater = 0;
+    m_modelRolesUpdater = nullptr;

 
     if (current) {
         m_modelRolesUpdater = new KFileItemModelRolesUpdater(static_cast<KFileItemModel*>(current), this);
 
     if (current) {
         m_modelRolesUpdater = new KFileItemModelRolesUpdater(static_cast<KFileItemModel*>(current), this);


@@ -249,8 +258,8 @@ void KFileItemListView::onScrollOrientationChanged(Qt::Orientation current, Qt::
 
 void KFileItemListView::onItemSizeChanged(const QSizeF& current, const QSizeF& previous)
 {
 
 void KFileItemListView::onItemSizeChanged(const QSizeF& current, const QSizeF& previous)
 {

-    Q_UNUSED(current);
-    Q_UNUSED(previous);
+    Q_UNUSED(current)
+    Q_UNUSED(previous)

     triggerVisibleIndexRangeUpdate();
 }
 
     triggerVisibleIndexRangeUpdate();
 }
 


@@ -398,6 +407,7 @@ void KFileItemListView::applyRolesToModel()
     roles.insert("text");
     roles.insert("isDir");
     roles.insert("isLink");
     roles.insert("text");
     roles.insert("isDir");
     roles.insert("isLink");

+    roles.insert("isHidden");

     if (supportsItemExpanding()) {
         roles.insert("isExpanded");
         roles.insert("isExpandable");
     if (supportsItemExpanding()) {
         roles.insert("isExpanded");
         roles.insert("isExpandable");