Fixed filtering button visible state

Librum-Reader · Jan 2, 2024 · 01e6f60 · 01e6f60
1 parent acae398
commit 01e6f60
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 4 deletions.
diff --git a/src/adapters/data_models/library_model/library_proxy_model.cpp b/src/adapters/data_models/library_model/library_proxy_model.cpp
@@ -106,9 +106,19 @@ void LibraryProxyModel::setFilterRequest(QString authors, QString format,
         .unread = unread,
     };
 
+    emit filterUpdated();
     invalidateFilter();
 }
 
+bool LibraryProxyModel::getIsFiltering()
+{
+    return !m_filterRequest.authors.isEmpty() ||
+           !m_filterRequest.format.isEmpty() ||
+           !m_filterRequest.language.isEmpty() || m_filterRequest.onlyBooks ||
+           m_filterRequest.onlyFiles || m_filterRequest.read ||
+           m_filterRequest.unread;
+}
+
 bool LibraryProxyModel::filterAcceptsRow(int source_row,
                                          const QModelIndex& source_parent) const
 {
@@ -159,6 +169,8 @@ QString LibraryProxyModel::getSortString()
 void LibraryProxyModel::addFilterTag(QString tag)
 {
     m_tags.emplace_back(tag);
+
+    emit filterUpdated();
     invalidateFilter();
 }
 
@@ -169,12 +181,16 @@ void LibraryProxyModel::removeFilterTag(QString tagToRemove)
         return;
 
     m_tags.erase(pos);
+
+    emit filterUpdated();
     invalidateFilter();
 }
 
 void LibraryProxyModel::clearFilterTags()
 {
     m_tags.clear();
+
+    emit filterUpdated();
     invalidateFilter();
 }
 

diff --git a/src/adapters/data_models/library_model/library_proxy_model.hpp b/src/adapters/data_models/library_model/library_proxy_model.hpp
@@ -21,6 +21,7 @@ class ADAPTERS_EXPORT LibraryProxyModel : public QSortFilterProxyModel
                    sortStringUpdated)
     Q_PROPERTY(
         int sortRole READ getSortRole WRITE setSortRole NOTIFY sortRoleUpdated)
+    Q_PROPERTY(bool isFiltering READ getIsFiltering NOTIFY filterUpdated)
 
 public:
     enum SortRole
@@ -45,6 +46,7 @@ class ADAPTERS_EXPORT LibraryProxyModel : public QSortFilterProxyModel
     Q_INVOKABLE void setFilterRequest(QString authors, QString format,
                                       QString language, bool onlyBooks,
                                       bool onlyFiles, bool read, bool unread);
+    Q_INVOKABLE bool getIsFiltering();
     Q_INVOKABLE void addFilterTag(QString tag);
     Q_INVOKABLE void removeFilterTag(QString tag);
     Q_INVOKABLE void clearFilterTags();
@@ -58,6 +60,7 @@ class ADAPTERS_EXPORT LibraryProxyModel : public QSortFilterProxyModel
 signals:
     void sortStringUpdated();
     void sortRoleUpdated();
+    void filterUpdated();
 
 private:
     std::optional<bool> leftBookIsCloserToSortString(

diff --git a/src/presentation/homePage/toolbar/MToolbar.qml b/src/presentation/homePage/toolbar/MToolbar.qml
@@ -52,8 +52,6 @@ Item {
                                   LibraryController.libraryModel.setFilterRequest(
                                       authors, format, language, onlyBooks,
                                       onlyFiles, read, unread)
-
-                                  resetFiltersButton.visible = true
                               }
         }
 
@@ -71,7 +69,7 @@ Item {
           */
         MRemoveOptionButton {
             id: resetFiltersButton
-            visible: false
+            visible: LibraryController.libraryModel.isFiltering
             text: qsTr("Remove Filters")
 
             onClicked: root.resetFilters()
@@ -165,7 +163,6 @@ Item {
         LibraryController.libraryModel.setFilterRequest("", "", "", false,
                                                         false, false, false)
         filterByButton.resetFilter()
-        resetFiltersButton.visible = false
     }
 
     function resetTags() {