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

qskConstrainedItemSize also respecting the minimum constraint

Browse Source
This commit is contained in:
Uwe Rathmann 2019-09-15 19:26:46 +02:00
parent 82e18ff967
commit 38974f747b
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/controls/QskQuick.cpp
View File

@ -523,6 +523,9 @@ QSizeF qskSizeConstraint( const QQuickItem* item,
QSizeF qskConstrainedItemSize( const QQuickItem* item, const QSizeF& size ) QSizeF qskConstrainedItemSize( const QQuickItem* item, const QSizeF& size )
{ {
if ( size.width() <= 0.0 && size.height() <= 0.0 )
return QSizeF( 0.0, 0.0 );
QSizeF constraint; QSizeF constraint;
switch( static_cast< int >( qskSizePolicy( item ).constraintType() ) ) switch( static_cast< int >( qskSizePolicy( item ).constraintType() ) )
@ -550,12 +553,10 @@ QSizeF qskConstrainedItemSize( const QQuickItem* item, const QSizeF& size )
if ( max.height() >= 0.0 ) if ( max.height() >= 0.0 )
height = qMin( height, max.height() ); height = qMin( height, max.height() );
#if 0
const auto min = qskSizeConstraint( item, Qt::MinimumSize, constraint ); const auto min = qskSizeConstraint( item, Qt::MinimumSize, constraint );
width = qMax( width, min.width() ); width = qMax( width, min.width() );
height = qMax( height, min.height() ); height = qMax( height, min.height() );
#endif
return QSizeF( width, height ); return QSizeF( width, height );
} }