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

qskItemSize added for Qt < 5.10

This commit is contained in:
Uwe Rathmann 2020-01-17 13:58:15 +01:00
parent 71a18b43ae
commit fe98439bd6
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/controls/QskQuick.cpp
View File

@ -16,6 +16,13 @@ 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 );

1
src/controls/QskQuick.h
View File

@ -48,6 +48,7 @@ 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* );

6
src/controls/QskQuickItem.h
View File

@ -57,7 +57,9 @@ class QSK_EXPORT QskQuickItem : public QQuickItem
QRectF geometry() const; QRectF geometry() const;
QRectF rect() const; QRectF rect() const;
#if QT_VERSION < QT_VERSION_CHECK( 5, 10, 0 )
QSizeF size() const; QSizeF size() const;
#endif
QSizeF implicitSize() const; QSizeF implicitSize() const;
void setGeometry( qreal x, qreal y, qreal width, qreal height ); void setGeometry( qreal x, qreal y, qreal width, qreal height );
@ -148,11 +150,15 @@ inline void QskQuickItem::setGeometry( const QRectF& rect )
setGeometry( rect.x(), rect.y(), rect.width(), rect.height() ); setGeometry( rect.x(), rect.y(), rect.width(), rect.height() );
} }
#if QT_VERSION < QT_VERSION_CHECK( 5, 10, 0 )
inline QSizeF QskQuickItem::size() const inline QSizeF QskQuickItem::size() const
{ {
return QSizeF( width(), height() ); return QSizeF( width(), height() );
} }
#endif
inline QSizeF QskQuickItem::implicitSize() const inline QSizeF QskQuickItem::implicitSize() const
{ {
return QSizeF( implicitWidth(), implicitHeight() ); return QSizeF( implicitWidth(), implicitHeight() );