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

dependency to QskLayoutHint removed

This commit is contained in:
Uwe Rathmann 2019-09-20 07:43:16 +02:00
parent c6553c3310
commit 81817d53da
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/controls/QskControl.cpp
View File

@ -14,7 +14,6 @@
#include "QskSkin.h" #include "QskSkin.h"
#include "QskSkinlet.h" #include "QskSkinlet.h"
#include "QskSkinHintTable.h" #include "QskSkinHintTable.h"
#include "QskLayoutHint.h"
#include <qlocale.h> #include <qlocale.h>
#include <qvector.h> #include <qvector.h>
@ -724,6 +723,14 @@ bool QskControl::event( QEvent* event )
Q_EMIT localeChanged( locale() ); Q_EMIT localeChanged( locale() );
break; break;
} }
case QEvent::ContentsRectChange:
{
resetImplicitSize();
if ( d_func()->autoLayoutChildren )
polish();
break;
}
case QEvent::LayoutRequest: case QEvent::LayoutRequest:
{ {
if ( d_func()->autoLayoutChildren ) if ( d_func()->autoLayoutChildren )
@ -994,19 +1001,19 @@ QSizeF QskControl::layoutSizeHint(
if ( constraint.width() >= 0.0 && policy.isConstrained( Qt::Vertical ) ) if ( constraint.width() >= 0.0 && policy.isConstrained( Qt::Vertical ) )
{ {
const auto hint = qskSizeConstraint( child, which, constraint ); const auto hint = qskSizeConstraint( child, which, constraint );
h = QskLayoutHint::combined( which, h, hint.height() ); h = qMax( h, hint.height() );
} }
else if ( constraint.height() >= 0.0 && policy.isConstrained( Qt::Horizontal ) ) else if ( constraint.height() >= 0.0 && policy.isConstrained( Qt::Horizontal ) )
{ {
const auto hint = qskSizeConstraint( child, which, constraint ); const auto hint = qskSizeConstraint( child, which, constraint );
w = QskLayoutHint::combined( which, w, hint.width() ); w = qMax( w, hint.width() );
} }
else else
{ {
const auto hint = qskSizeConstraint( child, which, QSizeF() ); const auto hint = qskSizeConstraint( child, which, QSizeF() );
w = QskLayoutHint::combined( which, w, hint.width() ); w = qMax( w, hint.width() );
h = QskLayoutHint::combined( which, h, hint.height() ); h = qMax( h, hint.height() );
} }
} }