kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-09-20 00:41:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move icons that end up outside the view after a resize event to

Browse source 
empty slots in the grid instead of doing a full relayout.

CCBUG: 182655

svn path=/trunk/KDE/kdebase/apps/; revision=944605
This commit is contained in:
Fredrik Höglund 2009-03-25 20:21:15 +00:00
parent 8cb2a4568c
commit 2d58be72d8
1 changed files with 20 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
plasma/applets/folderview/iconview.cpp
View file

@ -1739,31 +1739,35 @@ void IconView::timerEvent(QTimerEvent *event)
else if (event->timerId() == m_delayedRelayoutTimer.timerId()) {
m_delayedRelayoutTimer.stop();
bool needRelayout = false;
if (m_layoutBroken) {
// Only do the relayout if we have icons that are outside the view
// Relayout all icons that have ended up outside the view
const QRect cr = contentsRect().toRect();
QRect boundingRect = itemsBoundingRect();
boundingRect.adjust(-10, -10, 10, 10);
if (boundingRect.width() > cr.width()) {
needRelayout = true;
const QSize grid = gridSize();
QPoint pos;
for (int i = 0; i < m_items.size(); i++) {
if ((m_flow == QListView::LeftToRight && m_items[i].rect.right() > cr.right()) ||
(m_flow == QListView::TopToBottom && m_items[i].rect.bottom() > cr.height()))
{
pos = findNextEmptyPosition(pos, grid, cr);
m_items[i].rect.moveTo(pos);
}
}
m_regionCache.clear();
markAreaDirty(visibleArea());
} else {
int maxWidth = contentsRect().width() - m_scrollBar->geometry().width();
int maxHeight = contentsRect().height();
if ((m_flow == QListView::LeftToRight && columnsForWidth(maxWidth) != m_columns) ||
(m_flow == QListView::TopToBottom && rowsForHeight(maxHeight) != m_rows)) {
needRelayout = true;
(m_flow == QListView::TopToBottom && rowsForHeight(maxHeight) != m_rows))
{
emit busy(true);
// This is to give the busy animation a chance to appear.
m_delayedLayoutTimer.start(10, this);
m_validRows = 0;
}
}
if (needRelayout) {
emit busy(true);
// This is to give the busy animation a chance to appear.
m_delayedLayoutTimer.start(10, this);
m_validRows = 0;
}
}
}