BookmarksMenu: Load icons only when action is shown

See #1679
QupZilla · Dec 11, 2016 · d6ff977 · d6ff977
1 parent ca3d29d
commit d6ff977
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/src/lib/bookmarks/bookmarksmenu.cpp b/src/lib/bookmarks/bookmarksmenu.cpp
@@ -24,6 +24,7 @@
 #include "browserwindow.h"
 #include "qzsettings.h"
 #include "tabwidget.h"
+#include "iconprovider.h"
 
 BookmarksMenu::BookmarksMenu(QWidget* parent)
     : Menu(parent)
@@ -78,6 +79,21 @@ void BookmarksMenu::aboutToShow()
     }
 }
 
+void BookmarksMenu::menuAboutToShow()
+{
+    Q_ASSERT(qobject_cast<Menu*>(sender()));
+    Menu *menu = static_cast<Menu*>(sender());
+
+    foreach (QAction *action, menu->actions()) {
+        BookmarkItem *item = static_cast<BookmarkItem*>(action->data().value<void*>());
+        if (item && item->type() == BookmarkItem::Url && action->icon().isNull()) {
+            IconProvider::imageForUrlAsync(item->url(), action, [=](const QImage &img) {
+                action->setIcon(QIcon(QPixmap::fromImage(img)));
+            });
+        }
+    }
+}
+
 void BookmarksMenu::menuMiddleClicked(Menu* menu)
 {
     BookmarkItem* item = static_cast<BookmarkItem*>(menu->menuAction()->data().value<void*>());
@@ -156,6 +172,7 @@ void BookmarksMenu::init()
     addSeparator();
 
     connect(this, SIGNAL(aboutToShow()), this, SLOT(aboutToShow()));
+    connect(this, SIGNAL(aboutToShow()), this, SLOT(menuAboutToShow()));
     connect(this, SIGNAL(menuMiddleClicked(Menu*)), this, SLOT(menuMiddleClicked(Menu*)));
 }
 

diff --git a/src/lib/bookmarks/bookmarksmenu.h b/src/lib/bookmarks/bookmarksmenu.h
@@ -42,6 +42,7 @@ private slots:
 
     void bookmarksChanged();
     void aboutToShow();
+    void menuAboutToShow();
     void menuMiddleClicked(Menu* menu);
 
     void bookmarkActivated();

diff --git a/src/lib/bookmarks/bookmarkstools.cpp b/src/lib/bookmarks/bookmarkstools.cpp
@@ -365,6 +365,7 @@ void BookmarksTools::addFolderToMenu(QObject* receiver, Menu* menu, BookmarkItem
     QString title = QFontMetrics(m->font()).elidedText(folder->title(), Qt::ElideRight, 250);
     m->setTitle(title);
     m->setIcon(folder->icon());
+    QObject::connect(m, SIGNAL(aboutToShow()), receiver, SLOT(menuAboutToShow()));
     QObject::connect(m, SIGNAL(menuMiddleClicked(Menu*)), receiver, SLOT(menuMiddleClicked(Menu*)));
 
     QAction* act = menu->addMenu(m);
@@ -389,9 +390,6 @@ void BookmarksTools::addUrlToMenu(QObject* receiver, Menu* menu, BookmarkItem* b
     Action* act = new Action(menu);
     QString title = QFontMetrics(act->font()).elidedText(bookmark->title(), Qt::ElideRight, 250);
     act->setText(title);
-    IconProvider::imageForUrlAsync(bookmark->url(), act, [=](const QImage &img) {
-        act->setIcon(QIcon(QPixmap::fromImage(img)));
-    });
 
     act->setData(QVariant::fromValue<void*>(static_cast<void*>(bookmark)));
     act->setIconVisibleInMenu(true);