mirror of
https://invent.kde.org/system/dolphin
synced 2024-09-19 16:31:21 +00:00
Don't let KItemListView decide itself whether to show the header
The header should be turned on or off by the user of the KItemListView classes.
This commit is contained in:
parent
8d44ebc148
commit
0ebf2d1fe0
|
@ -148,7 +148,6 @@ void KItemListView::setItemSize(const QSizeF& itemSize)
|
||||||
m_layouter->setItemSize(itemSize);
|
m_layouter->setItemSize(itemSize);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
setHeaderShown(emptySize);
|
|
||||||
|
|
||||||
m_sizeHintResolver->clearCache();
|
m_sizeHintResolver->clearCache();
|
||||||
updateLayout();
|
updateLayout();
|
||||||
|
@ -1460,17 +1459,18 @@ void KItemListView::updateVisibleRolesSizes(const KItemRangeList& itemRanges)
|
||||||
|
|
||||||
if (itemCount == rangesItemCount) {
|
if (itemCount == rangesItemCount) {
|
||||||
m_visibleRolesSizes = visibleRolesSizes(itemRanges);
|
m_visibleRolesSizes = visibleRolesSizes(itemRanges);
|
||||||
|
if (m_header) {
|
||||||
// Assure the the sizes are not smaller than the minimum defined by the header
|
// Assure the the sizes are not smaller than the minimum defined by the header
|
||||||
// TODO: Currently only implemented for a top-aligned header
|
// TODO: Currently only implemented for a top-aligned header
|
||||||
const qreal minHeaderRoleWidth = m_header->minimumRoleWidth();
|
const qreal minHeaderRoleWidth = m_header->minimumRoleWidth();
|
||||||
QMutableHashIterator<QByteArray, QSizeF> it (m_visibleRolesSizes);
|
QMutableHashIterator<QByteArray, QSizeF> it (m_visibleRolesSizes);
|
||||||
while (it.hasNext()) {
|
while (it.hasNext()) {
|
||||||
it.next();
|
it.next();
|
||||||
const QSizeF& size = it.value();
|
const QSizeF& size = it.value();
|
||||||
if (size.width() < minHeaderRoleWidth) {
|
if (size.width() < minHeaderRoleWidth) {
|
||||||
const QSizeF newSize(minHeaderRoleWidth, size.height());
|
const QSizeF newSize(minHeaderRoleWidth, size.height());
|
||||||
m_visibleRolesSizes.insert(it.key(), newSize);
|
m_visibleRolesSizes.insert(it.key(), newSize);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -189,11 +189,16 @@ void DolphinItemListContainer::setItemLayout(KFileItemListView::Layout layout)
|
||||||
|
|
||||||
switch (layout) {
|
switch (layout) {
|
||||||
case KFileItemListView::IconsLayout:
|
case KFileItemListView::IconsLayout:
|
||||||
|
m_fileItemListView->setScrollOrientation(Qt::Vertical);
|
||||||
|
m_fileItemListView->setHeaderShown(false);
|
||||||
|
break;
|
||||||
case KFileItemListView::DetailsLayout:
|
case KFileItemListView::DetailsLayout:
|
||||||
m_fileItemListView->setScrollOrientation(Qt::Vertical);
|
m_fileItemListView->setScrollOrientation(Qt::Vertical);
|
||||||
|
m_fileItemListView->setHeaderShown(true);
|
||||||
break;
|
break;
|
||||||
case KFileItemListView::CompactLayout:
|
case KFileItemListView::CompactLayout:
|
||||||
m_fileItemListView->setScrollOrientation(Qt::Horizontal);
|
m_fileItemListView->setScrollOrientation(Qt::Horizontal);
|
||||||
|
m_fileItemListView->setHeaderShown(false);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
Q_ASSERT(false);
|
Q_ASSERT(false);
|
||||||
|
|
Loading…
Reference in a new issue