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

auto layouting code improved

Browse Source
This commit is contained in:
Uwe Rathmann 2019-09-18 08:57:08 +02:00
parent f4887a6e51
commit 425fb3978f
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/controls/QskControl.cpp
View File

@ -892,14 +892,19 @@ void QskControl::windowDeactivateEvent()
void QskControl::updateItemPolish() void QskControl::updateItemPolish()
{ {
if ( d_func()->autoLayoutChildren && !maybeUnresized() ) if ( d_func()->autoLayoutChildren && !maybeUnresized()
&& ( width() > 0.0 || height() > 0.0 ) )
{ {
const auto rect = layoutRect(); const auto rect = layoutRect();
const auto children = childItems(); const auto children = childItems();
for ( auto child : children ) for ( auto child : children )
{ {
// checking qskIsVisibleToParent ??? /*
We don't want to resize invisible children, but then
we would need to set up connections to know when a child
becomes visible. So we don't use qskIsVisibleToLayout here.
*/
if ( !qskIsTransparentForPositioner( child ) ) if ( !qskIsTransparentForPositioner( child ) )
{ {
const auto r = qskConstrainedItemRect( child, rect ); const auto r = qskConstrainedItemRect( child, rect );
@ -971,18 +976,21 @@ QSizeF QskControl::layoutSizeHint(
if ( which == Qt::MaximumSize || !d_func()->autoLayoutChildren ) if ( which == Qt::MaximumSize || !d_func()->autoLayoutChildren )
return QSizeF(); return QSizeF();
qreal w = constraint.width(); qreal w = -1.0;
qreal h = constraint.height(); qreal h = -1.0;
const auto children = childItems(); const auto children = childItems();
for ( const auto child : children ) for ( const auto child : children )
{ {
if ( qskIsVisibleToLayout( child ) ) if ( qskIsVisibleToLayout( child ) )
{ {
const auto hint = qskEffectiveSizeHint( child, which, constraint ); const auto hint = qskSizeConstraint( child, which, constraint );
w = QskLayoutHint::combined( which, w, hint.width() ); if ( constraint.width() < 0.0 )
h = QskLayoutHint::combined( which, h, hint.height() ); w = QskLayoutHint::combined( which, w, hint.width() );
if ( constraint.height() < 0.0 )
h = QskLayoutHint::combined( which, h, hint.height() );
} }
} }