Merge branch 'release/21.12'

1 files changed, 2 insertions, 16 deletions

diff --git a/src/kitemviews/kstandarditemlistwidget.cpp b/src/kitemviews/kstandarditemlistwidget.cpp
index b17fac6d5..04d8e0f7e 100644
--- a/src/kitemviews/kstandarditemlistwidget.cpp
+++ b/src/kitemviews/kstandarditemlistwidget.cpp
@@ -229,22 +229,8 @@ void KStandardItemListWidgetInformant::calculateCompactLayoutItemSizeHints(QVect
 void KStandardItemListWidgetInformant::calculateDetailsLayoutItemSizeHints(QVector<std::pair<qreal, bool>>& logicalHeightHints, qreal& logicalWidthHint, const KItemListView* view) const
 {
     const KItemListStyleOption& option = view->styleOption();
-
-    float zoomLevel = 1;
-    if (option.iconSize >= KIconLoader::SizeEnormous) {
-        zoomLevel = 2;
-    } else if (option.iconSize >= KIconLoader::SizeHuge) {
-        zoomLevel = 1.8;
-    } else if (option.iconSize >= KIconLoader::SizeLarge) {
-        zoomLevel = 1.6;
-    } else if (option.iconSize >= KIconLoader::SizeMedium) {
-        zoomLevel = 1.4;
-    } else if (option.iconSize >= KIconLoader::SizeSmallMedium) {
-        zoomLevel = 1.2;
-    }
-
-    const qreal contentHeight = qMax<qreal>(option.iconSize, zoomLevel * option.fontMetrics.height());
-    logicalHeightHints.fill(std::make_pair(contentHeight + 2 * option.padding, false));
+    const qreal height = option.padding * 2 + qMax(option.iconSize, option.fontMetrics.height());
+    logicalHeightHints.fill(height);
     logicalWidthHint = -1.0;
 }