diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2019-11-07 00:25:30 +0100 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2019-11-08 20:50:05 +0100 |
| commit | 15674f1a71be4fe74cf554e10f19e8570b90cb4f (patch) | |
| tree | 1b657736012359cf4a165c7abba1d46b4e5e70c6 /mobile-widgets | |
| parent | 20fda8afc37df863343d0f78ef983a3d42db7d34 (diff) | |
| download | subsurface-15674f1a71be4fe74cf554e10f19e8570b90cb4f.tar.gz | |
Mobile: modify filter so that all models get notified
When we change the filter string, we need to make sure that the collapsed model is
also aware of the change.
Similarly, instead of just calling resetFilter and directly changing the core
data structures, we need to set the filter to the empty string which ensures
that all three models get notified and the view updates correctly.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'mobile-widgets')
| -rw-r--r-- | mobile-widgets/qml/DiveList.qml | 2 | ||||
| -rw-r--r-- | mobile-widgets/qmlmanager.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/mobile-widgets/qml/DiveList.qml b/mobile-widgets/qml/DiveList.qml index 865feca35..f8b1744bd 100644 --- a/mobile-widgets/qml/DiveList.qml +++ b/mobile-widgets/qml/DiveList.qml @@ -557,7 +557,7 @@ Kirigami.ScrollablePage { text: qsTr("Filter dives") onTriggered: { rootItem.filterToggle = !rootItem.filterToggle - diveModel.resetFilter() + manager.setFilter("") numShownText = diveModel.shown() } } diff --git a/mobile-widgets/qmlmanager.cpp b/mobile-widgets/qmlmanager.cpp index 81da8c67c..bace5aed6 100644 --- a/mobile-widgets/qmlmanager.cpp +++ b/mobile-widgets/qmlmanager.cpp @@ -2090,6 +2090,7 @@ void QMLManager::setFilter(const QString filterText) QtConcurrent::run(QThreadPool::globalInstance(), [=]{ DiveListSortModel::instance()->setFilter(filterText); + CollapsedDiveListSortModel::instance()->updateFilterState(); QMetaObject::invokeMethod(qmlWindow, "hideBusyAndConnectModel"); }); } |