lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-04 09:00:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

When flow layout hasn't been visible, be conservative with its size

Browse Source 
* Because the flow layout adjusts to its available size, we instead set it to
  minimum size until it's first laid out. Otherwise it can get unreasonably
  sized.
This commit is contained in:
baldurk
2021-01-11 13:58:20 +00:00
parent 441be22410
commit b6462b19a9
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qrenderdoc/3rdparty/flowlayout/FlowLayout.cpp
Vendored
+14 -7
View File
@@ -125,6 +125,8 @@ bool FlowLayout::hasHeightForWidth() const
int FlowLayout::heightForWidth(int width) const
{
if(m_prevRect.isEmpty())
return minimumSize().height();
int height = doLayout(QRect(0, 0, width, 0), true);
return height;
}
@@ -144,6 +146,8 @@ void FlowLayout::setGeometry(const QRect &rect)
QSize FlowLayout::sizeHint() const
{
if(m_prevRect.isEmpty())
return minimumSize();
QSize size = geometry().size();
size.setHeight(doLayout(geometry().adjusted(0, 0, -10, 0), true));
return size;
@@ -158,14 +162,17 @@ QSize FlowLayout::minimumSize() const
size += QSize(2*margin(), 2*margin());
// we use the previous height as a hint for the minimum size otherwise we'll never request
// enough height for multiple rows
size.setHeight(qMax(size.height(), heightForWidth(m_prevRect.width())));
if(!m_prevRect.isEmpty())
{
// we use the previous height as a hint for the minimum size otherwise we'll never request
// enough height for multiple rows
size.setHeight(qMax(size.height(), heightForWidth(m_prevRect.width())));
// we use the previous width as a minimum, otherwise if we have a long item which expands
// up to a large width in our minimum, other layouts might starve us of enough height
// because it will assume we are sized to the minimum.
size.setWidth(qMin(size.width(), m_prevRect.width()));
// we use the previous width as a minimum, otherwise if we have a long item which expands
// up to a large width in our minimum, other layouts might starve us of enough height
// because it will assume we are sized to the minimum.
size.setWidth(qMin(size.width(), m_prevRect.width()));
}
return size;
}