diff --git a/src/layouts/QskIndexedLayoutBox.h b/src/layouts/QskIndexedLayoutBox.h index 5ca8eadf..4f97f700 100644 --- a/src/layouts/QskIndexedLayoutBox.h +++ b/src/layouts/QskIndexedLayoutBox.h @@ -31,10 +31,10 @@ class QSK_EXPORT QskIndexedLayoutBox : public QskBox void itemChange( ItemChange, const ItemChangeData& ) override; void reparentItem( QQuickItem* ); + private: virtual void autoAddItem( QQuickItem* ) = 0; virtual void autoRemoveItem( QQuickItem* ) = 0; - private: class PrivateData; std::unique_ptr< PrivateData > m_data; }; diff --git a/src/layouts/QskLinearBox.h b/src/layouts/QskLinearBox.h index 59c962a0..389a6f75 100644 --- a/src/layouts/QskLinearBox.h +++ b/src/layouts/QskLinearBox.h @@ -112,10 +112,10 @@ class QSK_EXPORT QskLinearBox : public QskIndexedLayoutBox QSizeF layoutSizeHint( Qt::SizeHint, const QSizeF& ) const override; + private: void autoAddItem( QQuickItem* ) override final; void autoRemoveItem( QQuickItem* ) override final; - private: void setItemActive( QQuickItem*, bool ); void removeItemInternal( int index, bool autoDelete ); diff --git a/src/layouts/QskStackBox.cpp b/src/layouts/QskStackBox.cpp index 4a8f1dca..ae0c0478 100644 --- a/src/layouts/QskStackBox.cpp +++ b/src/layouts/QskStackBox.cpp @@ -291,7 +291,7 @@ void QskStackBox::autoAddItem( QQuickItem* item ) void QskStackBox::autoRemoveItem( QQuickItem* item ) { - removeItemInternal( indexOf( item ), false ); + removeItemInternal( indexOf( item ), true ); } void QskStackBox::clear( bool autoDelete ) diff --git a/src/layouts/QskStackBox.h b/src/layouts/QskStackBox.h index 3c0bc9e8..1cf9e4c9 100644 --- a/src/layouts/QskStackBox.h +++ b/src/layouts/QskStackBox.h @@ -75,12 +75,12 @@ class QSK_EXPORT QskStackBox : public QskIndexedLayoutBox QSizeF layoutSizeHint( Qt::SizeHint, const QSizeF& ) const override; - void autoAddItem( QQuickItem* ) override final; - void autoRemoveItem( QQuickItem* ) override final; - QskStackBoxAnimator* effectiveAnimator(); private: + void autoAddItem( QQuickItem* ) override final; + void autoRemoveItem( QQuickItem* ) override final; + void removeItemInternal( int index, bool autoDelete ); class PrivateData;