Implement Fine-Tuned Zim Search

src/searchbar.cpp

@@ -230,6 +230,12 @@ void SearchBarLineEdit::fetchMoreSuggestion()
 
 void SearchBarLineEdit::onScrollToEnd(int value)
 {
+ if (m_suggestionModel.noMoreSuggestion())
+ {
+ m_scrolledEndBefore = false;
+ return;
+ }
+
  if (!m_completer.popup()->currentIndex().isValid())
  {
  m_scrolledEndBefore = false;

src/suggestionlistmodel.cpp

@@ -1,5 +1,6 @@
 #include "suggestionlistmodel.h"
 #include "kiwixapp.h"
+#include "suggestionlistworker.h"
 
 #include <QIcon>
 
@@ -62,6 +63,7 @@ void SuggestionListModel::resetUrlList(const QVector<QUrl> &urlList)
 {
  beginResetModel();
  m_urlList = urlList;
+ setNoMoreSuggestion(urlList.size());
  endResetModel();
 }
 
@@ -80,6 +82,7 @@ void SuggestionListModel::append(const QStringList &suggestions,
  m_urlList.append(urlList[i]);
  m_suggestions.append(suggestions[i]);
  }
+ setNoMoreSuggestion(urlList.size());
  endResetModel();
 }
 
@@ -93,3 +96,9 @@ QModelIndex SuggestionListModel::fetchEndIndex() const
  int trueFetchSize = m_urlList.size() - (m_hasFullText ? 1 : 0);
  return index(trueFetchSize - 1);
 }
+
+void SuggestionListModel::setNoMoreSuggestion(int fetchedSize)
+{
+ int trueFetchSize = fetchedSize - (m_hasFullText ? 1 : 0);
+ m_noMoreSuggestion = trueFetchSize < SuggestionListWorker::getFetchSize();
+}

src/suggestionlistmodel.h

@@ -23,11 +23,15 @@ class SuggestionListModel : public QAbstractListModel
  QModelIndex fetchEndIndex() const;
  void setHasFullText(bool hasFullText) { m_hasFullText = hasFullText; }
  bool hasFullText() const { return m_hasFullText; }
+ bool noMoreSuggestion() const { return m_noMoreSuggestion; }
 
 private:
  QStringList m_suggestions;
  QVector<QUrl> m_urlList;
  bool m_hasFullText = true;
+ bool m_noMoreSuggestion = true;
+
+ void setNoMoreSuggestion(int fetchedSize);
 };
 
 #endif // SUGGESTIONLISTMODEL_H