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

respecting minimum/maximum sizes

This commit is contained in:
Uwe Rathmann 2019-06-19 13:24:53 +02:00
parent e60373aa3c
commit 6a093b9343
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/controls/QskWindow.cpp
View File

@ -74,7 +74,7 @@ namespace
} }
private: private:
QQuickItem* m_contentItem; QQuickItem* m_contentItem = nullptr;
}; };
} }
@ -244,9 +244,14 @@ bool QskWindow::event( QEvent* event )
{ {
if ( size().isEmpty() ) if ( size().isEmpty() )
{ {
const QSize sz = effectivePreferredSize(); QSize sz = effectivePreferredSize();
if ( !sz.isEmpty() ) if ( !sz.isEmpty() )
{
sz = sz.expandedTo( minimumSize() );
sz = sz.boundedTo( maximumSize() );
resize( sz ); resize( sz );
}
} }
break; break;
@ -415,6 +420,7 @@ QSize QskWindow::effectivePreferredSize() const
if ( auto control = qskControlCast( child ) ) if ( auto control = qskControlCast( child ) )
{ {
const QSizeF itemConstraint = control->sizeHint(); const QSizeF itemConstraint = control->sizeHint();
if ( doWidth ) if ( doWidth )
constraint.setWidth( qMax( constraint.width(), itemConstraint.width() ) ); constraint.setWidth( qMax( constraint.width(), itemConstraint.width() ) );