diff --git a/src/common/QskFunctions.h b/src/common/QskFunctions.h index 2d91a8b9..a179122d 100644 --- a/src/common/QskFunctions.h +++ b/src/common/QskFunctions.h @@ -36,6 +36,18 @@ QSK_EXPORT QRectF qskInterpolatedRect( QSK_EXPORT QSizeF qskInterpolatedSize( const QSizeF& from, const QSizeF& to, qreal progress ); +inline QRect qskAlignedRect( const QRect& outerRect, + const QSize& size, Qt::Alignment alignment ) +{ + return qskAlignedRect( outerRect, size.width(), size.height(), alignment ); +} + +inline QRectF qskAlignedRectF( const QRectF& outerRect, + const QSizeF& size, Qt::Alignment alignment ) +{ + return qskAlignedRectF( outerRect, size.width(), size.height(), alignment ); +} + inline QMarginsF qskMargins( const QRectF& rect, const QRectF& innerRect ) { return QMarginsF( diff --git a/src/controls/QskQuick.cpp b/src/controls/QskQuick.cpp index 3c02c3ac..3012f862 100644 --- a/src/controls/QskQuick.cpp +++ b/src/controls/QskQuick.cpp @@ -640,7 +640,7 @@ QRectF qskConstrainedItemRect( const QQuickItem* item, const QRectF& rect, Qt::Alignment alignment ) { const auto size = qskConstrainedItemSize( item, rect.size() ); - return qskAlignedRectF( rect, size.width(), size.height(), alignment ); + return qskAlignedRectF( rect, size, alignment ); } void qskItemUpdateRecursive( QQuickItem* item ) diff --git a/src/controls/QskSkinlet.cpp b/src/controls/QskSkinlet.cpp index 052c3b28..8bce57ba 100644 --- a/src/controls/QskSkinlet.cpp +++ b/src/controls/QskSkinlet.cpp @@ -636,7 +636,7 @@ QSGNode* QskSkinlet::updateGraphicNode( const auto size = graphic.defaultSize().scaled( rect.size(), Qt::KeepAspectRatio ); - const auto r = qskAlignedRectF( rect, size.width(), size.height(), alignment ); + const auto r = qskAlignedRectF( rect, size, alignment ); return qskUpdateGraphicNode( skinnable, node, graphic, colorFilter, r, mirrored ); }