fix playlists view search; release 1.0.24

olegantonyan · May 21, 2024 · 7985c57 · 7985c57
1 parent 7bd251f
commit 7985c57
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,8 @@
-## [1.0.24] - 
-### Added
+## [1.0.24] - 2024-05-21
 
 ### Fixed
-- start position of track with CUE 
+- start position of track with CUE
+- filter playlists with long list view
 
 ### Misc
 - no more crash under Wayland (disabled QHotKey registration)

diff --git a/app/playlists_ui/playlistscontroller.cpp b/app/playlists_ui/playlistscontroller.cpp
@@ -186,12 +186,13 @@ namespace PlaylistsUi {
   }
 
   void Controller::on_search(const QString &term) {
-    proxy->setFilterWildcard("*" + term + "*");
-
-    QTimer::singleShot(20, [=]() {
-      if (!view->selectionModel()->selectedRows().isEmpty()) {
-        view->scrollTo(view->selectionModel()->selectedRows().first(), QAbstractItemView::PositionAtCenter);
-      }
-    });
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
+    QRegularExpression regex(term);
+    proxy->setFilterRegularExpression(regex);
+#else
+    QRegExp regex(term, Qt::CaseInsensitive, QRegExp::Wildcard);
+    proxy->setFilterRegExp(regex);
+#endif
+    proxy->setFilterCaseSensitivity(Qt::CaseInsensitive);
   }
 }
diff --git a/app/playlists_ui/playlistsproxyfiltermodel.cpp b/app/playlists_ui/playlistsproxyfiltermodel.cpp
@@ -9,6 +9,15 @@ namespace PlaylistsUi {
 
   int ProxyFilterModel::rowCount(const QModelIndex &parent) const {
     Q_UNUSED(parent)
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
+    if(!filterRegularExpression().pattern().isEmpty()) {
+      return QSortFilterProxyModel::rowCount(parent);
+    }
+#else
+    if(!filterRegExp().isEmpty()) {
+      return QSortFilterProxyModel::rowCount(parent);
+    }
+#endif
     if (sourceModel()) {
       return sourceModel()->rowCount();
     }