qskAlignedRect overloads
This commit is contained in:
parent
c67a594d07
commit
6c778c4b07
|
@ -36,6 +36,18 @@ QSK_EXPORT QRectF qskInterpolatedRect(
|
||||||
QSK_EXPORT QSizeF qskInterpolatedSize(
|
QSK_EXPORT QSizeF qskInterpolatedSize(
|
||||||
const QSizeF& from, const QSizeF& to, qreal progress );
|
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 )
|
inline QMarginsF qskMargins( const QRectF& rect, const QRectF& innerRect )
|
||||||
{
|
{
|
||||||
return QMarginsF(
|
return QMarginsF(
|
||||||
|
|
|
@ -640,7 +640,7 @@ QRectF qskConstrainedItemRect( const QQuickItem* item,
|
||||||
const QRectF& rect, Qt::Alignment alignment )
|
const QRectF& rect, Qt::Alignment alignment )
|
||||||
{
|
{
|
||||||
const auto size = qskConstrainedItemSize( item, rect.size() );
|
const auto size = qskConstrainedItemSize( item, rect.size() );
|
||||||
return qskAlignedRectF( rect, size.width(), size.height(), alignment );
|
return qskAlignedRectF( rect, size, alignment );
|
||||||
}
|
}
|
||||||
|
|
||||||
void qskItemUpdateRecursive( QQuickItem* item )
|
void qskItemUpdateRecursive( QQuickItem* item )
|
||||||
|
|
|
@ -636,7 +636,7 @@ QSGNode* QskSkinlet::updateGraphicNode(
|
||||||
const auto size = graphic.defaultSize().scaled(
|
const auto size = graphic.defaultSize().scaled(
|
||||||
rect.size(), Qt::KeepAspectRatio );
|
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 );
|
return qskUpdateGraphicNode( skinnable, node, graphic, colorFilter, r, mirrored );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue