diff options
Diffstat (limited to 'src/quicktemplates2/qquickscrollview.cpp')
-rw-r--r-- | src/quicktemplates2/qquickscrollview.cpp | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/src/quicktemplates2/qquickscrollview.cpp b/src/quicktemplates2/qquickscrollview.cpp index c4ca2caa..1d7ecfad 100644 --- a/src/quicktemplates2/qquickscrollview.cpp +++ b/src/quicktemplates2/qquickscrollview.cpp @@ -106,8 +106,6 @@ class QQuickScrollViewPrivate : public QQuickPanePrivate Q_DECLARE_PUBLIC(QQuickScrollView) public: - QQuickScrollViewPrivate(); - QQmlListProperty<QObject> contentData() override; QQmlListProperty<QQuickItem> contentChildren() override; QList<QQuickItem *> contentChildItems() const override; @@ -137,19 +135,10 @@ public: void itemImplicitWidthChanged(QQuickItem *item) override; - bool wasTouched; - QQuickFlickable *flickable; + bool wasTouched = false; + QQuickFlickable *flickable = nullptr; }; -QQuickScrollViewPrivate::QQuickScrollViewPrivate() - : wasTouched(false), - flickable(nullptr) -{ - contentWidth = -1; - contentHeight = -1; - wheelEnabled = true; -} - QList<QQuickItem *> QQuickScrollViewPrivate::contentChildItems() const { if (!flickable) @@ -377,8 +366,12 @@ void QQuickScrollViewPrivate::itemImplicitWidthChanged(QQuickItem *item) QQuickScrollView::QQuickScrollView(QQuickItem *parent) : QQuickPane(*(new QQuickScrollViewPrivate), parent) { - setActiveFocusOnTab(true); + Q_D(QQuickScrollView); + d->contentWidth = -1; + d->contentHeight = -1; + setFiltersChildMouseEvents(true); + setWheelEnabled(true); } /*! |