ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8012 from CozmoP/gridfix 

Qt: fix bug when grid item width > grid width
This commit is contained in:
Twinaphex 2019-01-16 01:49:13 +01:00 committed by GitHub
parent 10c7929d55 e4bc578466
commit 4e73be94b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 59 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
ui/drivers/qt/gridview.cpp
View File

@ -94,66 +94,80 @@ void GridView::calculateRectsIfNecessary() const
const int maxWidth = viewport()->width(); const int maxWidth = viewport()->width();
switch (m_viewMode) if (m_size + m_spacing * 2 > maxWidth)
{ {
case Anchored: m_rectForRow[0] = QRectF(x, y, m_size, m_size);
for (row = 1; row < model()->rowCount(); ++row)
{ {
int columns = (maxWidth - m_spacing) / (m_size + m_spacing); y += m_size + m_spacing;
if (columns > 0) m_rectForRow[row] = QRectF(x, y, m_size, m_size);
}
}
else
{
switch (m_viewMode)
{
case Anchored:
{ {
const int actualSpacing = (maxWidth - m_spacing - m_size - (columns - 1) * m_size) / columns; int columns = (maxWidth - m_spacing) / (m_size + m_spacing);
if (columns > 0)
{
const int actualSpacing = (maxWidth - m_spacing - m_size - (columns - 1) * m_size) / columns;
for (row = 0; row < model()->rowCount(); ++row)
{
nextX = x + m_size + actualSpacing;
if (nextX > maxWidth)
{
x = m_spacing;
y += m_size + m_spacing;
nextX = x + m_size + actualSpacing;
}
m_rectForRow[row] = QRectF(x, y, m_size, m_size);
x = nextX;
}
}
break;
}
case Centered:
{
int columns = (maxWidth - m_spacing) / (m_size + m_spacing);
if (columns > 0)
{
const int actualSpacing = (maxWidth - columns * m_size) / (columns + 1);
x = actualSpacing;
for (row = 0; row < model()->rowCount(); ++row)
{
nextX = x + m_size + actualSpacing;
if (nextX > maxWidth)
{
x = actualSpacing;
y += m_size + m_spacing;
nextX = x + m_size + actualSpacing;
}
m_rectForRow[row] = QRectF(x, y, m_size, m_size);
x = nextX;
}
}
break;
}
case Simple:
for (row = 0; row < model()->rowCount(); ++row) for (row = 0; row < model()->rowCount(); ++row)
{ {
nextX = x + m_size + actualSpacing; nextX = x + m_size + m_spacing;
if (nextX > maxWidth) if (nextX > maxWidth)
{ {
x = m_spacing; x = m_spacing;
y += m_size + m_spacing; y += m_size + m_spacing;
nextX = x + m_size + actualSpacing; nextX = x + m_size + m_spacing;
} }
m_rectForRow[row] = QRectF(x, y, m_size, m_size); m_rectForRow[row] = QRectF(x, y, m_size, m_size);
x = nextX; x = nextX;
} }
break;
} }
break;
}
case Centered:
{
int columns = (maxWidth - m_spacing) / (m_size + m_spacing);
if (columns > 0)
{
const int actualSpacing = (maxWidth - columns * m_size) / (columns + 1);
x = actualSpacing;
for (row = 0; row < model()->rowCount(); ++row)
{
nextX = x + m_size + actualSpacing;
if (nextX > maxWidth)
{
x = actualSpacing;
y += m_size + m_spacing;
nextX = x + m_size + actualSpacing;
}
m_rectForRow[row] = QRectF(x, y, m_size, m_size);
x = nextX;
}
}
break;
}
case Simple:
for (row = 0; row < model()->rowCount(); ++row)
{
nextX = x + m_size + m_spacing;
if (nextX > maxWidth)
{
x = m_spacing;
y += m_size + m_spacing;
nextX = x + m_size + m_spacing;
}
m_rectForRow[row] = QRectF(x, y, m_size, m_size);
x = nextX;
}
break;
} }
m_idealHeight = y + m_size + m_spacing; m_idealHeight = y + m_size + m_spacing;
m_hashIsDirty = false; m_hashIsDirty = false;
viewport()->update(); viewport()->update();