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

qskSizeConstraint fixed

Browse Source
This commit is contained in:
Uwe Rathmann 2019-09-16 12:30:59 +02:00
parent 5f751ede09
commit 15ae3901a9
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/controls/QskQuick.cpp
View File

@ -460,6 +460,10 @@ QSizeF qskSizeConstraint( const QQuickItem* item,
int constraintType = QskSizePolicy::Unconstrained; int constraintType = QskSizePolicy::Unconstrained;
/*
We apply a constraint - even, when the policy is unconstrained.
Do we really want to do this ???
*/
if ( constraint.height() >= 0.0 ) if ( constraint.height() >= 0.0 )
{ {
const auto c = qskBoundedConstraint( item, constraint, policy ); const auto c = qskBoundedConstraint( item, constraint, policy );
@ -497,7 +501,7 @@ QSizeF qskSizeConstraint( const QQuickItem* item,
size = qskEffectiveSizeHint( item, whichH ); size = qskEffectiveSizeHint( item, whichH );
if ( whichV != whichH ) if ( whichV != whichH )
constraintType = QskSizePolicy::HeightForWidth; size.setHeight( qskEffectiveSizeHint( item, whichV ).height() );
} }
} }
} }