kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-10-05 16:19:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/KDE/4.13'

Browse source
This commit is contained in:
Frank Reininghaus 2014-06-01 14:48:30 +02:00
parent 4fe788f115 96c34cfe65
commit 90e27974a4
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/kitemviews/kitemlistview.cpp
View file

@ -1048,11 +1048,17 @@ void KItemListView::slotItemsInserted(const KItemRangeList& itemRanges)
(!verticalScrollOrientation && maximumScrollOffset() > size().width());
if (decreaseLayouterSize) {
const int scrollBarExtent = style()->pixelMetric(QStyle::PM_ScrollBarExtent);
int scrollbarSpacing = 0;
if (style()->styleHint(QStyle::SH_ScrollView_FrameOnlyAroundContents)) {
scrollbarSpacing = style()->pixelMetric(QStyle::PM_ScrollView_ScrollBarSpacing);
}
QSizeF layouterSize = m_layouter->size();
if (verticalScrollOrientation) {
layouterSize.rwidth() -= scrollBarExtent;
layouterSize.rwidth() -= scrollBarExtent + scrollbarSpacing;
} else {
layouterSize.rheight() -= scrollBarExtent;
layouterSize.rheight() -= scrollBarExtent + scrollbarSpacing;
}
m_layouter->setSize(layouterSize);
}

2
src/kitemviews/kitemlistwidget.cpp
View file

@ -282,7 +282,7 @@ bool KItemListWidget::isHovered() const
void KItemListWidget::setHoverPosition(const QPointF& pos)
{
if (m_selectionToggle) {
m_selectionToggle->setHovered(m_selectionToggle->contains(pos));
m_selectionToggle->setHovered(selectionToggleRect().contains(pos));
}
}