From 1713d5794cd578fbe1d083737647285ba7edac60 Mon Sep 17 00:00:00 2001 From: Martin Jones Date: Wed, 16 Sep 2009 15:31:02 +1000 Subject: Small tweaks. --- src/declarative/fx/qfxlistview.cpp | 10 ++-------- src/declarative/fx/qfxlistview.h | 1 - 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/declarative/fx/qfxlistview.cpp b/src/declarative/fx/qfxlistview.cpp index 168e4c4..015eacf 100644 --- a/src/declarative/fx/qfxlistview.cpp +++ b/src/declarative/fx/qfxlistview.cpp @@ -570,13 +570,7 @@ void QFxListViewPrivate::layout() return; q->refill(); updateHighlight(); - if (orient == Qt::Vertical) { - fixupY(); - q->setViewportHeight(endPosition() - startPosition()); - } else { - fixupX(); - q->setViewportWidth(endPosition() - startPosition()); - } + fixupPosition(); updateUnrequestedPositions(); } @@ -1131,7 +1125,7 @@ void QFxListView::setStrictlyEnforceHighlightRange(bool strict) } /*! - \qmlproperty int ListView::spacing + \qmlproperty real ListView::spacing This property holds the spacing to leave between items. */ diff --git a/src/declarative/fx/qfxlistview.h b/src/declarative/fx/qfxlistview.h index e5c3138..cc3d910 100644 --- a/src/declarative/fx/qfxlistview.h +++ b/src/declarative/fx/qfxlistview.h @@ -62,7 +62,6 @@ class Q_DECLARATIVE_EXPORT QFxListView : public QFxFlickable Q_OBJECT Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QFxListView) - Q_ENUMS(CurrentItemPositioning) Q_PROPERTY(QVariant model READ model WRITE setModel) Q_PROPERTY(QmlComponent *delegate READ delegate WRITE setDelegate) Q_PROPERTY(int currentIndex READ currentIndex WRITE setCurrentIndex NOTIFY currentIndexChanged) -- cgit v0.12