minor changes

This commit is contained in:
Uwe Rathmann 2018-12-14 09:11:00 +01:00
parent dfa8170316
commit 763c920c2d

View File

@ -140,6 +140,8 @@ QLayoutPolicy::Policy QskLayoutItem::sizePolicy( Qt::Orientation orientation ) c
{ {
auto policy = QskLayoutConstraint::sizePolicy( m_item ).policy( orientation ); auto policy = QskLayoutConstraint::sizePolicy( m_item ).policy( orientation );
#if 1 #if 1
// we need to get rid of this extra check as we are calling sizeHint trillion times TODO ...
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
@ -196,12 +198,10 @@ Qt::Orientation QskLayoutItem::dynamicConstraintOrientation() const
if ( auto control = qobject_cast< const QskControl* >( m_item ) ) if ( auto control = qobject_cast< const QskControl* >( m_item ) )
{ {
const QskSizePolicy& policy = control->sizePolicy(); const auto policy = control->sizePolicy().horizontalPolicy();
if ( policy.horizontalPolicy() == QskSizePolicy::Constrained ) return ( policy == QskSizePolicy::Constrained )
return Qt::Horizontal; ? Qt::Horizontal : Qt::Vertical;
else
return Qt::Vertical;
} }
return orientation; return orientation;