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

- Prevent icons from being placed at fractional grid positions when

Browse source 
they're manually positioned near the edge of the icon view and align
  to grid is enabled.
- Take the direction of the flow into account when aligning icons to the grid.
- Fix an off-by-one error in nextGridPosition().

Fixed for: KDE 4.4 RC2
BUG: 195996

svn path=/trunk/KDE/kdebase/apps/; revision=1077284
This commit is contained in:
Fredrik Höglund 2010-01-19 21:38:31 +00:00
parent c1cb689a14
commit 997ee31955
2 changed files with 48 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -567,7 +567,7 @@ QPoint inline IconView::nextGridPosition(const QPoint &lastPos, const QSize &gri
}
const int xOrigin = (m_flow == LeftToRight || m_flow == TopToBottom) ?
r.left() : r.right() - grid.width();
r.left() : r.right() - grid.width() + 1;
if (lastPos.isNull()) {
return QPoint(xOrigin, r.top());
@ -751,12 +751,50 @@ void IconView::layoutItems()
updateScrollBar();
}
// Returns the contents rect with the width and height snapped to the grid
// and aligned according to the direction of the flow.
QRect IconView::adjustedContentsRect(int *rowCount, int *colCount) const
{
QRect r = contentsRect().toRect();
const QSize size = gridSize() + QSize(10, 10);
*colCount = qMax(1, (r.width() - 10) / size.width());
*rowCount = qMax(1, (r.height() - 10) / size.height());
int dx = r.width() - (*colCount * size.width() + 10);
int dy = r.height() - (*rowCount * size.height() + 10);
r.setWidth(r.width() - dx);
r.setHeight(r.height() - dy);
// Take the origin into account
if (m_flow == RightToLeft || m_flow == TopToBottomRightToLeft) {
r.translate(dx, 0);
}
return r;
}
void IconView::alignIconsToGrid()
{
int rowCount, colCount;
const QRect cr = adjustedContentsRect(&rowCount, &colCount);
int lastRow = rowCount - 1;
int lastCol = colCount - 1;
const Plasma::Containment *containment = qobject_cast<Plasma::Containment*>(parentWidget());
if (!containment || !containment->isContainment()) {
// Don't limit the max rows/columns in the scrolling direction
if (m_flow == LeftToRight || m_flow == RightToLeft) {
lastRow = INT_MAX;
} else {
lastCol = INT_MAX;
}
}
int margin = 10;
int spacing = 10;
const QRect cr = contentsRect().toRect();
const QSize size = gridSize() + QSize(spacing, spacing);
int topMargin = margin + cr.top();
int leftMargin = margin + cr.left();
int vOffset = topMargin + size.height() / 2;
@ -765,11 +803,10 @@ void IconView::alignIconsToGrid()
for (int i = 0; i < m_items.size(); i++) {
const QPoint center = m_items[i].rect.center();
const int col = qRound((center.x() - hOffset) / qreal(size.width()));
const int row = qRound((center.y() - vOffset) / qreal(size.height()));
const int col = qBound(0, qRound((center.x() - hOffset) / qreal(size.width())), lastCol);
const int row = qBound(0, qRound((center.y() - vOffset) / qreal(size.height())), lastRow);
const QPoint pos(leftMargin + col * size.width() + (size.width() - m_items[i].rect.width() - spacing) / 2,
topMargin + row * size.height());
const QPoint pos(leftMargin + col * size.width(), topMargin + row * size.height());
if (pos != m_items[i].rect.topLeft()) {
m_items[i].rect.moveTo(pos);
@ -2178,7 +2215,10 @@ void IconView::dropEvent(QGraphicsSceneDragDropEvent *event)
}
}
const QRect cr = contentsRect().toRect();
int rowCount, colCount;
const QRect cr = m_alignToGrid ? adjustedContentsRect(&rowCount, &colCount)
: contentsRect().toRect();
boundingRect.adjust(-10, -10, 10, 10);
boundingRect.translate(delta);

1
plasma/applets/folderview/iconview.h
View file

@ -202,6 +202,7 @@ private:
void layoutItems();
void alignIconsToGrid();
QRect itemsBoundingRect() const;
QRect adjustedContentsRect(int *rowCount, int *colCount) const;
bool doLayoutSanityCheck();
void saveIconPositions() const;
void loadIconPositions();