mirror of
https://invent.kde.org/system/dolphin
synced 2024-10-28 03:21:56 +00:00
Merge remote-tracking branch 'origin/KDE/4.11' into KDE/4.12
This commit is contained in:
commit
92cb6b3a18
|
@ -351,14 +351,15 @@ void KItemListContainer::updateGeometries()
|
|||
? extra + scrollbarSpacing + style()->pixelMetric(QStyle::PM_ScrollBarExtent, &option, this)
|
||||
: extra;
|
||||
|
||||
rect.adjust(0, 0, -widthDec, -heightDec);
|
||||
|
||||
const QRectF newGeometry(0, 0, rect.width(), rect.height());
|
||||
const QRectF newGeometry(0, 0, rect.width() - widthDec,
|
||||
rect.height() - heightDec);
|
||||
if (m_controller->view()->geometry() != newGeometry) {
|
||||
m_controller->view()->setGeometry(newGeometry);
|
||||
|
||||
static_cast<KItemListContainerViewport*>(viewport())->scene()->setSceneRect(0, 0, rect.width(), rect.height());
|
||||
static_cast<KItemListContainerViewport*>(viewport())->viewport()->setGeometry(QRect(0, 0, rect.width(), rect.height()));
|
||||
// Get the real geometry of the view again since the scrollbars
|
||||
// visibilities and the view geometry may have changed in re-layout.
|
||||
static_cast<KItemListContainerViewport*>(viewport())->scene()->setSceneRect(m_controller->view()->geometry());
|
||||
static_cast<KItemListContainerViewport*>(viewport())->viewport()->setGeometry(m_controller->view()->geometry().toRect());
|
||||
|
||||
updateScrollOffsetScrollBar();
|
||||
updateItemOffsetScrollBar();
|
||||
|
|
Loading…
Reference in a new issue