mirror of
https://invent.kde.org/system/dolphin
synced 2024-10-05 16:19:10 +00:00
Merge branch 'release/21.12'
This commit is contained in:
commit
793ad44cb8
|
@ -229,22 +229,8 @@ void KStandardItemListWidgetInformant::calculateCompactLayoutItemSizeHints(QVect
|
||||||
void KStandardItemListWidgetInformant::calculateDetailsLayoutItemSizeHints(QVector<std::pair<qreal, bool>>& logicalHeightHints, qreal& logicalWidthHint, const KItemListView* view) const
|
void KStandardItemListWidgetInformant::calculateDetailsLayoutItemSizeHints(QVector<std::pair<qreal, bool>>& logicalHeightHints, qreal& logicalWidthHint, const KItemListView* view) const
|
||||||
{
|
{
|
||||||
const KItemListStyleOption& option = view->styleOption();
|
const KItemListStyleOption& option = view->styleOption();
|
||||||
|
const qreal height = option.padding * 2 + qMax(option.iconSize, option.fontMetrics.height());
|
||||||
float zoomLevel = 1;
|
logicalHeightHints.fill(height);
|
||||||
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));
|
|
||||||
logicalWidthHint = -1.0;
|
logicalWidthHint = -1.0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue