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

qskItemSize() removed, QQuickItem::size() is available since Qt 5.10

Browse Source
This commit is contained in:
Uwe Rathmann 2022-04-07 15:43:45 +02:00
parent c44c30fa41
commit c17e3defd3
4 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/thumbnails/main.cpp
View File

@ -158,7 +158,7 @@ class IconGrid : public QskLinearBox
const int dim = dimension(); const int dim = dimension();
// we know, that all items have the same size // we know, that all items have the same size
const auto itemSize = qskItemSize( itemAtIndex( 0 ) ); const auto itemSize = itemAtIndex( 0 )->size();
const int rowMin = rect.top() / ( itemSize.height() + spacing() ); const int rowMin = rect.top() / ( itemSize.height() + spacing() );
const int rowMax = rect.bottom() / ( itemSize.height() + spacing() ); const int rowMax = rect.bottom() / ( itemSize.height() + spacing() );

15
src/controls/QskQuick.cpp
View File

@ -16,13 +16,6 @@ QSK_QT_PRIVATE_END
#include <qpa/qplatforminputcontext.h> #include <qpa/qplatforminputcontext.h>
#include <qpa/qplatformintegration.h> #include <qpa/qplatformintegration.h>
QSizeF qskItemSize( const QQuickItem* item )
{
// obsolete for Qt >= 5.10
auto d = QQuickItemPrivate::get( item );
return QSizeF( d->width, d->height );
}
QRectF qskItemRect( const QQuickItem* item ) QRectF qskItemRect( const QQuickItem* item )
{ {
auto d = QQuickItemPrivate::get( item ); auto d = QQuickItemPrivate::get( item );
@ -41,7 +34,7 @@ void qskSetItemGeometry( QQuickItem* item, const QRectF& rect )
{ {
control->setGeometry( rect ); control->setGeometry( rect );
} }
else else if ( item )
{ {
item->setPosition( rect.topLeft() ); item->setPosition( rect.topLeft() );
item->setSize( rect.size() ); item->setSize( rect.size() );
@ -63,10 +56,10 @@ bool qskIsAncestorOf( const QQuickItem* item, const QQuickItem* child )
bool qskIsVisibleToParent( const QQuickItem* item ) bool qskIsVisibleToParent( const QQuickItem* item )
{ {
if ( item ) if ( item == nullptr )
return QQuickItemPrivate::get( item )->explicitVisible;
return false; return false;
return QQuickItemPrivate::get( item )->explicitVisible;
} }
bool qskIsVisibleTo( const QQuickItem* item, const QQuickItem* ancestor ) bool qskIsVisibleTo( const QQuickItem* item, const QQuickItem* ancestor )

1
src/controls/QskQuick.h
View File

@ -48,7 +48,6 @@ QSK_EXPORT QskSizePolicy qskSizePolicy( const QQuickItem* );
QSK_EXPORT Qt::Alignment qskLayoutAlignmentHint( const QQuickItem* ); QSK_EXPORT Qt::Alignment qskLayoutAlignmentHint( const QQuickItem* );
QSK_EXPORT bool qskRetainSizeWhenHidden( const QQuickItem* ); QSK_EXPORT bool qskRetainSizeWhenHidden( const QQuickItem* );
QSK_EXPORT QSizeF qskItemSize( const QQuickItem* );
QSK_EXPORT QRectF qskItemRect( const QQuickItem* ); QSK_EXPORT QRectF qskItemRect( const QQuickItem* );
QSK_EXPORT QRectF qskItemGeometry( const QQuickItem* ); QSK_EXPORT QRectF qskItemGeometry( const QQuickItem* );

2
src/controls/QskScrollArea.cpp
View File

@ -500,7 +500,7 @@ QSizeF QskScrollArea::layoutSizeHint( Qt::SizeHint which, const QSizeF& constrai
} }
else else
{ {
hint = qskItemSize( contentItem ); hint = contentItem->size();
} }
if ( verticalScrollBarPolicy() != Qt::ScrollBarAlwaysOff ) if ( verticalScrollBarPolicy() != Qt::ScrollBarAlwaysOff )