From fb69036dbd5478c47d90037f3be6413c4c826b7b Mon Sep 17 00:00:00 2001 From: Emmanuel Pescosta Date: Sun, 25 May 2014 18:55:56 +0200 Subject: Use "selectionToggleRect().contains(pos)" instead of "m_selectionToggle->contains(pos)" in KItemListWidget::setHoverPosition(const QPointF& pos). This wrong check was accidentally introduced by commit 24326d447358f0dbfc18963743207d4a3d4f1c9e BUG: 299328 REVIEW: 118320 FIXED-IN: 4.13.2 --- src/kitemviews/kitemlistwidget.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/kitemviews/kitemlistwidget.cpp b/src/kitemviews/kitemlistwidget.cpp index 44754a694..c261bf1d2 100644 --- a/src/kitemviews/kitemlistwidget.cpp +++ b/src/kitemviews/kitemlistwidget.cpp @@ -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)); } } -- cgit v1.3 From 96c34cfe650cef24bcfd6cfa6977c3b0ccb77281 Mon Sep 17 00:00:00 2001 From: Emmanuel Pescosta Date: Sun, 25 May 2014 18:30:37 +0200 Subject: Fix Bug 334696 - File/directory icons/names move to the right when opening/refreshing contents of Dolphin Take the scrollbar spacing into account. BUG: 334696 REVIEW: 118319 FIXED-IN: 4.13.2 --- src/kitemviews/kitemlistview.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/kitemviews/kitemlistview.cpp b/src/kitemviews/kitemlistview.cpp index f1b35fa53..222a29cf5 100644 --- a/src/kitemviews/kitemlistview.cpp +++ b/src/kitemviews/kitemlistview.cpp @@ -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); } -- cgit v1.3