From: Felix Ernst Date: Sat, 29 Jan 2022 17:47:40 +0000 (+0100) Subject: Fix my previous bad merge X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/64af89a3ffa780b33a87b32c5098964e72286ed0 Fix my previous bad merge I failed to notice that the changes didn't apply cleanly. With this commit everything should be a-okay again. --- diff --git a/src/kitemviews/kstandarditemlistwidget.cpp b/src/kitemviews/kstandarditemlistwidget.cpp index 04d8e0f7e..668382cd5 100644 --- a/src/kitemviews/kstandarditemlistwidget.cpp +++ b/src/kitemviews/kstandarditemlistwidget.cpp @@ -230,7 +230,7 @@ void KStandardItemListWidgetInformant::calculateDetailsLayoutItemSizeHints(QVect { const KItemListStyleOption& option = view->styleOption(); const qreal height = option.padding * 2 + qMax(option.iconSize, option.fontMetrics.height()); - logicalHeightHints.fill(height); + logicalHeightHints.fill(std::make_pair(height, false)); logicalWidthHint = -1.0; }