diff options
Diffstat (limited to 'src/quick/items/qquickpathview_p_p.h')
-rw-r--r-- | src/quick/items/qquickpathview_p_p.h | 51 |
1 files changed, 12 insertions, 39 deletions
diff --git a/src/quick/items/qquickpathview_p_p.h b/src/quick/items/qquickpathview_p_p.h index 274086ea7c..3b7487afbf 100644 --- a/src/quick/items/qquickpathview_p_p.h +++ b/src/quick/items/qquickpathview_p_p.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtQuick module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QQUICKPATHVIEW_P_P_H #define QQUICKPATHVIEW_P_P_H @@ -67,6 +31,8 @@ QT_REQUIRE_CONFIG(quick_pathview); #include <private/qquicktimeline_p_p.h> #include <private/qpodvector_p.h> +#include <QtCore/qpointer.h> + QT_BEGIN_NAMESPACE class QQmlOpenMetaObjectType; @@ -88,6 +54,12 @@ public: } } + void itemDestroyed(QQuickItem *item) override + { + if (!items.removeOne(item)) + itemCache.removeOne(item); + } + void scheduleLayout() { Q_Q(QQuickPathView); if (!layoutScheduled) { @@ -103,7 +75,7 @@ public: void clear(); void updateMappedRange(); qreal positionOfIndex(qreal index) const; - bool isInBound(qreal position, qreal lower, qreal upper) const; + bool isInBound(qreal position, qreal lower, qreal upper, bool emptyRangeCheck = true) const; void createHighlight(); void updateHighlight(); void setHighlightPosition(qreal pos); @@ -168,6 +140,7 @@ public: int pathItems; int requestedIndex; int cacheSize; + int requestedCacheSize; qreal requestedZ; QList<QQuickItem *> items; QList<QQuickItem *> itemCache; |