diff --git a/src/qml/DiscoverPage.qml b/src/qml/DiscoverPage.qml index c529f6b4..b6c12a85 100644 --- a/src/qml/DiscoverPage.qml +++ b/src/qml/DiscoverPage.qml @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL */ -import QtQuick 2.14 +import QtQuick 2.15 import QtQuick.Controls 2.15 as Controls import QtQuick.Layouts 1.14 @@ -78,14 +78,13 @@ Kirigami.ScrollablePage { } ListView { anchors.fill: parent + reuseItems: true + model: PodcastSearchModel { id: podcastSearchModel } spacing: 5 clip: true - delegate: Kirigami.DelegateRecycler { - width: parent ? parent.width : implicitWidth - sourceComponent: delegateComponent - } + delegate: delegateComponent } } diff --git a/src/qml/EpisodeListPage.qml b/src/qml/EpisodeListPage.qml index dab8d2bb..8573a7ea 100644 --- a/src/qml/EpisodeListPage.qml +++ b/src/qml/EpisodeListPage.qml @@ -131,13 +131,9 @@ Kirigami.ScrollablePage { id: episodeList anchors.fill: parent visible: count !== 0 - model: episodeProxyModel + reuseItems: true - // TODO: seems like reuseItems is way too slow; using DelegateRecycler - // for now; still have to find out why... - delegate: Kirigami.DelegateRecycler { - width: episodeList.width - sourceComponent: episodeListDelegate - } + model: episodeProxyModel + delegate: episodeListDelegate } } diff --git a/src/qml/ErrorListOverlay.qml b/src/qml/ErrorListOverlay.qml index b4237642..a779eb51 100644 --- a/src/qml/ErrorListOverlay.qml +++ b/src/qml/ErrorListOverlay.qml @@ -4,8 +4,8 @@ * SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL */ -import QtQuick 2.14 -import QtQuick.Controls 2.14 as Controls +import QtQuick 2.15 +import QtQuick.Controls 2.15 as Controls import QtQuick.Layouts 1.14 import QtGraphicalEffects 1.15 @@ -45,6 +45,8 @@ Kirigami.OverlaySheet { id: errorList visible: errorList.count > 0 implicitWidth: Kirigami.Units.gridUnit * 20 + reuseItems: true + model: ErrorLogModel Component { @@ -89,10 +91,7 @@ Kirigami.OverlaySheet { } } - delegate: Kirigami.DelegateRecycler { - width: errorList.width - sourceComponent: errorListDelegate - } + delegate: errorListDelegate } contentItem: errorList.count > 0 ? errorList : placeholder