2 files changed, 14 insertions, 2 deletions
diff --git a/src/kitemviews/kfileitemmodel.cpp b/src/kitemviews/kfileitemmodel.cpp
index 699ce289c..72c3d1410 100644
--- a/src/kitemviews/kfileitemmodel.cpp
+++ b/src/kitemviews/kfileitemmodel.cpp
@@ -2174,7 +2174,14 @@ QHash<QByteArray, QVariant> KFileItemModel::retrieveData(const KFileItem &item,
     }
 
     if (m_requestRole[NameRole]) {
-        data.insert(sharedValue("text"), item.text());
+        QString displayName = item.text();
+        if (ContentDisplaySettings::hideFileExtensions() && !isDir) {
+            const int dotIndex = displayName.lastIndexOf(QLatin1Char('.'));
+            if (dotIndex > 0) {
+                displayName = displayName.left(dotIndex);
+            }
+        }
+        data.insert(sharedValue("text"), displayName);
     }
 
     if (m_requestRole[ExtensionRole] && !isDir) {
diff --git a/src/kitemviews/private/kpixmapmodifier.cpp b/src/kitemviews/private/kpixmapmodifier.cpp
index bf316b880..96aea26d4 100644
--- a/src/kitemviews/private/kpixmapmodifier.cpp
+++ b/src/kitemviews/private/kpixmapmodifier.cpp
@@ -15,6 +15,8 @@
 
 #include "kpixmapmodifier.h"
 
+#include "dolphin_iconsmodesettings.h"
+
 #include <QGuiApplication>
 #include <QImage>
 #include <QPainter>
@@ -281,7 +283,10 @@ void KPixmapModifier::scale(QPixmap &pixmap, const QSize &scaledSize)
         return;
     }
     qreal dpr = pixmap.devicePixelRatio();
-    pixmap = pixmap.scaled(scaledSize, Qt::KeepAspectRatio, Qt::SmoothTransformation);
+    const Qt::TransformationMode mode = IconsModeSettings::usePixelatedScaling()
+        ? Qt::FastTransformation
+        : Qt::SmoothTransformation;
+    pixmap = pixmap.scaled(scaledSize, Qt::KeepAspectRatio, mode);
     pixmap.setDevicePixelRatio(dpr);
 }