commit 1512b794f2785de5718a99b79f60de536deabe25 Author: Leonardo Sobral Cunha Date: Thu Sep 1 14:12:47 2011 +0200 Fix minYExtent in ListView for Header appearance This is related to the behavior change introduced in c0fc795f. diff --git a/src/declarative/items/qsglistview.cpp b/src/declarative/items/qsglistview.cpp index 3be4a4b..b212162 100644 --- a/src/declarative/items/qsglistview.cpp +++ b/src/declarative/items/qsglistview.cpp @@ -1862,7 +1862,6 @@ void QSGListView::setSnapMode(SnapMode mode) } } - /*! \qmlproperty Component QtQuick2::ListView::footer This property holds the component to use as the footer. @@ -2017,6 +2016,23 @@ void QSGListView::geometryChanged(const QRectF &newGeometry, const QRectF &oldGe QSGItemView::geometryChanged(newGeometry, oldGeometry); } +qreal QSGListView::minXExtent() const +{ + Q_D(const QSGListView); + if (orientation() == QSGListView::Horizontal && d->header) + return d->headerSize(); + else + return 0.0; +} + +qreal QSGListView::minYExtent() const +{ + Q_D(const QSGListView); + if (orientation() == QSGListView::Vertical && d->header) + return d->headerSize(); + else + return 0.0; +} /*! \qmlmethod QtQuick2::ListView::incrementCurrentIndex() diff --git a/src/declarative/items/qsglistview_p.h b/src/declarative/items/qsglistview_p.h index e45e16b..3a04e69 100644 --- a/src/declarative/items/qsglistview_p.h +++ b/src/declarative/items/qsglistview_p.h @@ -163,6 +163,8 @@ protected: virtual void viewportMoved(); virtual void keyPressEvent(QKeyEvent *); virtual void geometryChanged(const QRectF &newGeometry,const QRectF &oldGeometry); + virtual qreal minXExtent() const; + virtual qreal minYExtent() const; protected Q_SLOTS: void updateSections();