Add Correct Elide for MultiZim

kiwix · Aug 29, 2024 · a2cddc0 · a2cddc0
1 parent 2feeb7b
commit a2cddc0
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 9 deletions.
diff --git a/src/searchbar.cpp b/src/searchbar.cpp
@@ -323,17 +323,35 @@ void MultiZimButton::update_display()
  radioBt->setFont(QFont("Selawik", 16));
 
  QFontMetrics metrics(radioBt->font());
- QString elidedText = metrics.elidedText(bookTitle, Qt::ElideRight, mp_buttonList->width() - 100);
- radioBt->setText(elidedText);
+ QString elidedText = metrics.elidedText(bookTitle, Qt::ElideRight, mp_buttonList->width() - 85);
+ if (bookTitle != elidedText)
+ {
+ elidedText.chop(5);
+ KiwixApp::isRightToLeft() == elidedText.isRightToLeft() ? elidedText.append("(...)") : elidedText.prepend("(...)");
+ radioBt->setText(elidedText);
+ }
+ else
+ radioBt->setText(bookTitle);
 
  auto item = new QListWidgetItem;
  item->setSizeHint(QSize(0, 42));
  item->setData(Qt::UserRole, bookId);
  if (current && current->zimId() == bookId)
  {
  QFontMetrics metrics(radioBt->font());
- QString elidedText = metrics.elidedText("* " + bookTitle, Qt::ElideRight, mp_buttonList->width() - 100);
- radioBt->setText(elidedText);
+ QString elidedText = metrics.elidedText(bookTitle, Qt::ElideRight, mp_buttonList->width() - 85);
+ if (bookTitle != elidedText)
+ {
+ elidedText.chop(6);
+ KiwixApp::isRightToLeft() == elidedText.isRightToLeft() ? elidedText.append("(...)") : elidedText.prepend("(...)");
+ KiwixApp::isRightToLeft() == elidedText.isRightToLeft() ? elidedText.prepend("*") : elidedText.append("*");
+ radioBt->setText(elidedText);
+ }
+ else
+ {
+ KiwixApp::isRightToLeft() == bookTitle.isRightToLeft() ? bookTitle.prepend("*") : bookTitle.append("*");
+ radioBt->setText(bookTitle);
+ }
  mp_buttonList->insertItem(0, item);
  }
  else

diff --git a/src/suggestionlistworker.cpp b/src/suggestionlistworker.cpp
@@ -15,12 +15,7 @@ void SuggestionListWorker::run()
  QStringList suggestionList;
  QVector<QUrl> urlList;
 
- // WebView *current = KiwixApp::instance()->getTabWidget()->currentWebView();
- // if(!current)
- // return;
  auto currentZimId = KiwixApp::instance()->getMainWindow()->getTopWidget()->getSearchBar().getMultiZimButton().getZimId();
- // auto qurl = current->url();
- // auto currentZimId = qurl.host().split(".")[0];
  try {
  auto archive = KiwixApp::instance()->getLibrary()->getArchive(currentZimId);
  QUrl url;