Implement Fine-Tuned Zim Search

kiwix-desktop.pro

@@ -62,6 +62,7 @@ SOURCES += \
  src/rownode.cpp \
  src/suggestionlistworker.cpp \
  src/suggestionlistmodel.cpp \
+ src/suggestionlistdelegate.cpp \
  src/thumbnaildownloader.cpp \
  src/translation.cpp \
  src/main.cpp \
@@ -111,6 +112,7 @@ HEADERS += \
  src/rownode.h \
  src/suggestionlistworker.h \
  src/suggestionlistmodel.h \
+ src/suggestionlistdelegate.h \
  src/thumbnaildownloader.h \
  src/translation.h \
  src/mainwindow.h \

src/searchbar.cpp

@@ -6,6 +6,7 @@
 
 #include "kiwixapp.h"
 #include "suggestionlistworker.h"
+#include "suggestionlistdelegate.h"
 
 BookmarkButton::BookmarkButton(QWidget *parent) :
  QToolButton(parent)
@@ -76,6 +77,7 @@ SearchBarLineEdit::SearchBarLineEdit(QWidget *parent) :
  /* QCompleter's uses default list views, which do not have headers. */
  m_completer.setPopup(m_suggestionView);
 
+ m_suggestionView->setItemDelegate(new SuggestionListDelegate(this));
  m_suggestionView->header()->setStretchLastSection(true);
  m_suggestionView->setRootIsDecorated(false);
  m_suggestionView->setStyleSheet(KiwixApp::instance()->parseStyleFromFile(":/css/popup.css"));

src/suggestionlistdelegate.cpp

@@ -0,0 +1,70 @@
+#include "suggestionlistdelegate.h"
+#include "kiwixapp.h"
+
+#include <QPainter>
+
+void SuggestionListDelegate::paint(QPainter *painter,
+ const QStyleOptionViewItem &option,
+ const QModelIndex &index) const
+{
+ /* Paint without text and icon */
+ QStyleOptionViewItem opt(option);
+ QStyledItemDelegate::paint(painter, opt, QModelIndex());
+
+ paintIcon(painter, opt, index);
+ paintText(painter, opt, index);
+}
+
+void SuggestionListDelegate::paintIcon(QPainter *p,
+ const QStyleOptionViewItem &opt,
+ const QModelIndex &index) const
+{
+ QRect pixmapRect = opt.rect;
+
+ /* See line-height&padding resources/css/popup.css QHeaderView::section. 
+ We need to add 10px of padding to match header.
+ */
+ QSize mapSize = QSize(24, 24);
+ auto pixmap = index.data(Qt::DecorationRole).value<QIcon>().pixmap(mapSize);
+ if (KiwixApp::isRightToLeft())
+ {
+ int rightEnd = pixmapRect.width() - mapSize.width();
+ pixmapRect.setX(pixmapRect.x() + rightEnd - 10);
+ }
+ else
+ pixmapRect.setX(pixmapRect.x() + 10);
+
+ pixmapRect.setY(pixmapRect.y() + (pixmapRect.height() - mapSize.height()) / 2);
+ pixmapRect.setSize(mapSize);
+ p->drawPixmap(pixmapRect, pixmap);
+}
+
+void SuggestionListDelegate::paintText(QPainter *p,
+ const QStyleOptionViewItem &opt,
+ const QModelIndex &index) const
+{
+ auto& searchBar = KiwixApp::instance()->getSearchBar();
+ auto lineEditGeo = searchBar.getLineEdit().geometry();
+
+ /* See SearchBar border in resources/css/style.css. Align text with text in
+ line edit. Remove border from left() as completer is inside border.
+ */
+ auto left = lineEditGeo.left() - 1;
+ QRect textRect = opt.rect;
+ if (KiwixApp::isRightToLeft())
+ {
+ /* Calculate the distance of right side of search bar to line edit as
+ text now starts on the right.
+ */
+ auto searchGeo = searchBar.geometry();
+ auto right = searchGeo.width() - left - lineEditGeo.width();
+ textRect.setWidth(textRect.width() - right);
+ }
+ else
+ textRect.setX(textRect.x() + left);
+
+ int flag = {Qt::AlignVCenter | Qt::AlignLeading};
+ QString text = index.data(Qt::DisplayRole).toString();
+ p->drawText(textRect, flag, text);
+ return;
+}

src/suggestionlistdelegate.h

@@ -0,0 +1,17 @@
+#ifndef SUGGESTIONLISTDELEGATE_H
+#define SUGGESTIONLISTDELEGATE_H
+
+#include <QStyledItemDelegate>
+
+class SuggestionListDelegate : public QStyledItemDelegate
+{
+public:
+ SuggestionListDelegate(QObject *parent = nullptr) : QStyledItemDelegate(parent) {};
+ void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
+
+private:
+ void paintIcon(QPainter *p, const QStyleOptionViewItem &opt, const QModelIndex &index) const;
+ void paintText(QPainter *p, const QStyleOptionViewItem &opt, const QModelIndex &index) const;
+};
+
+#endif // SUGGESTIONLISTDELEGATE_H