Miroirs/eliot
1
0
Fork 0
mirror of git://git.savannah.nongnu.org/eliot.git synced 2024-11-17 07:48:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

TileLayout: fix the row offset on lines other than the first one

Browse source
This commit is contained in:
Olivier Teulière 2012-12-17 22:32:44 +01:00
parent b5c36bed26
commit bf5ae9fc91
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
qt/tile_layout.cpp
View file

@ -178,30 +178,32 @@ void TileLayout::setGeometry(const QRect &rect)
const int squareSize = squareSizeWithSpacing - spacing();
// Handle margins and alignment
int x = contentsRect().left() + contentsMargins().left();
int left = contentsRect().left() + contentsMargins().left();
if (alignment() & Qt::AlignRight)
x += width - m_nbCols * squareSizeWithSpacing;
left += width - m_nbCols * squareSizeWithSpacing;
else if (alignment() & Qt::AlignHCenter)
x += (width - m_nbCols * squareSizeWithSpacing) / 2;
int y = contentsRect().top() + contentsMargins().top();
left += (width - m_nbCols * squareSizeWithSpacing) / 2;
int top = contentsRect().top() + contentsMargins().top();
if (alignment() & Qt::AlignBottom)
y += height - m_nbRows * squareSizeWithSpacing;
top += height - m_nbRows * squareSizeWithSpacing;
else if (alignment() & Qt::AlignVCenter)
y += (height - m_nbRows * squareSizeWithSpacing) / 2;
top += (height - m_nbRows * squareSizeWithSpacing) / 2;
// Resize items
int nbInRow = 1;
QLayoutItem *item;
int x = left;
int y = top;
foreach (item, m_items)
{
QRect itemRect(QPoint(x, y), QSize(squareSize, squareSize));
item->setGeometry(itemRect);
x += squareSize + spacing();
x += squareSizeWithSpacing;
++nbInRow;
if (nbInRow > m_nbCols)
{
x = 0;
y += squareSize + spacing();
x = left;
y += squareSizeWithSpacing;
nbInRow = 1;
}
}