Add 38c34eeca to .git-blame-ignore-revs

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

diff --git a/src/kitemviews/kstandarditemlistwidget.cpp b/src/kitemviews/kstandarditemlistwidget.cpp
index e37013f95fe88562313c8c42e1bd7cd72c165b9d..2a28d198ab5ad8d4a6cb9b9631a91e5d46b74b3e 100644 (file)
--- a/src/kitemviews/kstandarditemlistwidget.cpp
+++ b/src/kitemviews/kstandarditemlistwidget.cpp
@@ -10,6 +10,7 @@
 #include "kfileitemmodel.h"
 #include "private/kfileitemclipboard.h"
 #include "private/kitemlistroleeditor.h"
+#include "private/kitemviewsutils.h"
 #include "private/kpixmapmodifier.h"
 
 #include <KIconEffect>
@@ -294,11 +295,6 @@ void KStandardItemListWidget::setLayout(Layout layout)
     }
 }
 
-KStandardItemListWidget::Layout KStandardItemListWidget::layout() const
-{
-    return m_layout;
-}
-
 void KStandardItemListWidget::setHighlightEntireRow(bool highlightEntireRow)
 {
     if (m_highlightEntireRow != highlightEntireRow) {
@@ -821,6 +817,7 @@ void KStandardItemListWidget::editedRoleChanged(const QByteArray &current, const
         rect.setWidth(parent->width() - rect.left());
     }
     m_roleEditor->setGeometry(rect.toRect());
+    m_roleEditor->autoAdjustSize();
     m_roleEditor->show();
     m_roleEditor->setFocus();
 }
@@ -964,6 +961,7 @@ void KStandardItemListWidget::updatePixmapCache()
     const bool iconOnTop = (m_layout == IconsLayout);
     const KItemListStyleOption &option = styleOption();
     const qreal padding = option.padding;
+    const qreal dpr = KItemViewsUtils::devicePixelRatio(this);
 
     const int widgetIconSize = iconSize();
     const int maxIconWidth = iconOnTop ? widgetSize.width() - 2 * padding : widgetIconSize;
@@ -1024,7 +1022,7 @@ void KStandardItemListWidget::updatePixmapCache()
         } else if (m_pixmap.width() / m_pixmap.devicePixelRatio() != maxIconWidth || m_pixmap.height() / m_pixmap.devicePixelRatio() != maxIconHeight) {
             // A custom pixmap has been applied. Assure that the pixmap
             // is scaled to the maximum available size.
-            KPixmapModifier::scale(m_pixmap, QSize(maxIconWidth, maxIconHeight) * qApp->devicePixelRatio());
+            KPixmapModifier::scale(m_pixmap, QSize(maxIconWidth, maxIconHeight) * dpr);
         }
 
         if (m_pixmap.isNull()) {
@@ -1072,8 +1070,8 @@ void KStandardItemListWidget::updatePixmapCache()
     const int maxScaledIconHeight = scaledIconSize;
 
     m_scaledPixmapSize = m_pixmap.size();
-    m_scaledPixmapSize.scale(maxScaledIconWidth * qApp->devicePixelRatio(), maxScaledIconHeight * qApp->devicePixelRatio(), Qt::KeepAspectRatio);
-    m_scaledPixmapSize = m_scaledPixmapSize / qApp->devicePixelRatio();
+    m_scaledPixmapSize.scale(maxScaledIconWidth * dpr, maxScaledIconHeight * dpr, Qt::KeepAspectRatio);
+    m_scaledPixmapSize = m_scaledPixmapSize / dpr;
 
     if (iconOnTop) {
         // Center horizontally and align on bottom within the icon-area
@@ -1170,7 +1168,7 @@ void KStandardItemListWidget::updateTextsCache()
         if (ratingSize.width() > availableWidth) {
             ratingSize.rwidth() = availableWidth;
         }
-        const qreal dpr = qApp->devicePixelRatio();
+        const qreal dpr = KItemViewsUtils::devicePixelRatio(this);
         m_rating = QPixmap(ratingSize.toSize() * dpr);
         m_rating.setDevicePixelRatio(dpr);
         m_rating.fill(Qt::transparent);
@@ -1472,9 +1470,10 @@ void KStandardItemListWidget::updateAdditionalInfoTextColor()
 void KStandardItemListWidget::drawPixmap(QPainter *painter, const QPixmap &pixmap)
 {
     if (m_scaledPixmapSize != pixmap.size() / pixmap.devicePixelRatio()) {
+        const qreal dpr = KItemViewsUtils::devicePixelRatio(this);
         QPixmap scaledPixmap = pixmap;
-        KPixmapModifier::scale(scaledPixmap, m_scaledPixmapSize * qApp->devicePixelRatio());
-        scaledPixmap.setDevicePixelRatio(qApp->devicePixelRatio());
+        KPixmapModifier::scale(scaledPixmap, m_scaledPixmapSize * dpr);
+        scaledPixmap.setDevicePixelRatio(dpr);
         painter->drawPixmap(m_pixmapPos, scaledPixmap);
 
 #ifdef KSTANDARDITEMLISTWIDGET_DEBUG
@@ -1558,10 +1557,7 @@ void KStandardItemListWidget::closeRoleEditor()
 QPixmap KStandardItemListWidget::pixmapForIcon(const QString &name, const QStringList &overlays, int size, QIcon::Mode mode) const
 {
     static const QIcon fallbackIcon = QIcon::fromTheme(QStringLiteral("unknown"));
-    qreal dpr = qApp->devicePixelRatio();
-    if (scene() && !scene()->views().isEmpty()) {
-        dpr = scene()->views().constFirst()->devicePixelRatioF();
-    }
+    const qreal dpr = KItemViewsUtils::devicePixelRatio(this);
 
     size *= dpr;