peranger/qskinny
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mismatch warnigs added

Browse Source
This commit is contained in:
Uwe Rathmann 2019-09-14 15:31:48 +02:00
parent 65feaac031
commit fb5885b3d7
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/layouts/QskLayoutEngine2D.cpp
View File

@ -385,18 +385,32 @@ QSizeF QskLayoutEngine2D::sizeHint(
auto& rowChain = m_data->rowChain; auto& rowChain = m_data->rowChain;
auto& columnChain = m_data->columnChain; auto& columnChain = m_data->columnChain;
if ( constraint.width() >= 0.0 || constraint.height() >= 0.0 )
{
const auto type = constraintType();
if ( constraint.width() >= 0 )
{
if ( type == QskSizePolicy::WidthForHeight )
qWarning( "QskLayoutEngine2D: WidthForHeight conflict." );
}
else
{
if ( type == QskSizePolicy::HeightForWidth )
qWarning( "QskLayoutEngine2D: HeightForWidth conflict." );
}
}
m_data->blockInvalidate = true; m_data->blockInvalidate = true;
if ( ( constraint.width() >= 0 ) && if ( constraint.width() >= 0 )
( constraintType() == QskSizePolicy::HeightForWidth ) )
{ {
setupChain( Qt::Horizontal ); setupChain( Qt::Horizontal );
const auto constraints = columnChain.segments( constraint.width() ); const auto constraints = columnChain.segments( constraint.width() );
setupChain( Qt::Vertical, constraints ); setupChain( Qt::Vertical, constraints );
} }
else if ( ( constraint.height() >= 0 ) && else if ( constraint.height() >= 0 )
( constraintType() == QskSizePolicy::WidthForHeight ) )
{ {
setupChain( Qt::Vertical ); setupChain( Qt::Vertical );