Merge branch 'Applications/18.04'

This commit is contained in:
Nathaniel Graham 2018-04-19 19:01:01 -06:00
commit e8d8a8c35b

View file

@ -179,14 +179,6 @@ void DolphinItemListView::updateGridSize()
const int minItemWidth = 48;
itemWidth = minItemWidth + IconsModeSettings::textWidthIndex() * 64;
if (previewsShown()) {
// Optimize the width for previews with a 3:2 aspect ratio instead
// of a 1:1 ratio to avoid wasting too much vertical space when
// showing photos.
const int minWidth = iconSize * 3 / 2;
itemWidth = qMax(itemWidth, minWidth);
}
if (itemWidth < iconSize + padding * 2) {
itemWidth = iconSize + padding * 2;
}