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

avoid useless sizeHint calls

Browse Source
This commit is contained in:
Uwe Rathmann 2018-12-19 10:02:14 +01:00
parent 4409cee0cf
commit 8473f5c2a1
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/layouts/QskLayoutItem.cpp
View File

@ -100,13 +100,19 @@ QSizeF QskLayoutItem::sizeHint(
if ( whichHint == Qt::PreferredSize && QskLayoutConstraint::hasDynamicConstraint( m_item ) ) if ( whichHint == Qt::PreferredSize && QskLayoutConstraint::hasDynamicConstraint( m_item ) )
{ {
const quint32 growFlags = QLayoutPolicy::GrowFlag | QLayoutPolicy::ExpandFlag; const quint32 growFlags = QLayoutPolicy::GrowFlag | QLayoutPolicy::ExpandFlag;
hint = QskLayoutConstraint::effectiveConstraint( m_item, whichHint );
if ( constraint.width() > 0 ) if ( constraint.width() > 0 )
{ {
qreal w = constraint.width(); qreal w = constraint.width();
if ( !( sizePolicy( Qt::Horizontal ) & growFlags ) ) if ( !( sizePolicy( Qt::Horizontal ) & growFlags ) )
w = qMin( w, hint.width() ); {
const auto maxW = QskLayoutConstraint::effectiveConstraint(
m_item, Qt::PreferredSize ).width();
if ( maxW >= 0.0 )
w = qMin( w, maxW );
}
hint.setWidth( w ); hint.setWidth( w );
hint.setHeight( QskLayoutConstraint::heightForWidth( m_item, w ) ); hint.setHeight( QskLayoutConstraint::heightForWidth( m_item, w ) );
@ -114,14 +120,23 @@ QSizeF QskLayoutItem::sizeHint(
else if ( constraint.height() > 0 ) else if ( constraint.height() > 0 )
{ {
qreal h = constraint.height(); qreal h = constraint.height();
if ( !( sizePolicy( Qt::Vertical ) & growFlags ) ) if ( !( sizePolicy( Qt::Vertical ) & growFlags ) )
h = qMin( h, hint.height() ); {
const auto maxH = QskLayoutConstraint::effectiveConstraint(
m_item, Qt::PreferredSize ).height();
if ( maxH >= 0.0 )
h = qMin( h, maxH );
}
hint.setWidth( QskLayoutConstraint::widthForHeight( m_item, h ) ); hint.setWidth( QskLayoutConstraint::widthForHeight( m_item, h ) );
hint.setHeight( h ); hint.setHeight( h );
} }
else else
{ {
hint = QskLayoutConstraint::effectiveConstraint( m_item, Qt::PreferredSize );
if ( dynamicConstraintOrientation() == Qt::Horizontal ) if ( dynamicConstraintOrientation() == Qt::Horizontal )
hint.setWidth( QskLayoutConstraint::widthForHeight( m_item, hint.height() ) ); hint.setWidth( QskLayoutConstraint::widthForHeight( m_item, hint.height() ) );
else else
@ -133,15 +148,16 @@ QSizeF QskLayoutItem::sizeHint(
hint = QskLayoutConstraint::effectiveConstraint( m_item, whichHint ); hint = QskLayoutConstraint::effectiveConstraint( m_item, whichHint );
} }
hint = hint.expandedTo( QSizeF( 0.0, 0.0 ) );
return hint; return hint;
} }
QLayoutPolicy::Policy QskLayoutItem::sizePolicy( Qt::Orientation orientation ) const QLayoutPolicy::Policy QskLayoutItem::sizePolicy( Qt::Orientation orientation ) const
{ {
auto policy = QskLayoutConstraint::sizePolicy( m_item ).policy( orientation ); auto policy = QskLayoutConstraint::sizePolicy( m_item ).policy( orientation );
#if 1
// we need to get rid of this extra check as we are calling sizeHint trillion times TODO ...
#if 0
if ( ( policy == QskSizePolicy::Preferred ) && m_item ) if ( ( policy == QskSizePolicy::Preferred ) && m_item )
{ {
// QskSizePolicy::Preferred without having a preferred size is the default // QskSizePolicy::Preferred without having a preferred size is the default