FancyMenu: no need to store favorites il LXQtFancyMenuWindow

lxqt · Jan 27, 2024 · 52a42d5 · 52a42d5
1 parent 4634f3f
commit 52a42d5
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 10 deletions.
diff --git a/plugin-fancymenu/lxqtfancymenuappmap.cpp b/plugin-fancymenu/lxqtfancymenuappmap.cpp
@@ -112,6 +112,7 @@ void LXQtFancyMenuAppMap::setFavorites(const QStringList &favorites)
     clearFavorites();
 
     Category& favoritesCatRef = mCategories[0];
+    favoritesCatRef.apps.reserve(favorites.size());
 
     for(const QString& desktopFile : favorites)
     {
@@ -122,6 +123,26 @@ void LXQtFancyMenuAppMap::setFavorites(const QStringList &favorites)
             continue;
         favoritesCatRef.apps.append(item);
     }
+
+    favoritesCatRef.apps.squeeze();
+}
+
+QStringList LXQtFancyMenuAppMap::getFavorites() const
+{
+    const Category& favoritesCatRef = mCategories[0];
+
+    QStringList favorites;
+    favorites.reserve(favoritesCatRef.apps.size());
+
+    for(const Category::Item& item : favoritesCatRef.apps)
+    {
+        if(item.appItem)
+        {
+            favorites.append(item.appItem->desktopFile);
+        }
+    }
+
+    return favorites;
 }
 
 int LXQtFancyMenuAppMap::getFavoriteIndex(const QString &desktopFile) const

diff --git a/plugin-fancymenu/lxqtfancymenuappmap.h b/plugin-fancymenu/lxqtfancymenuappmap.h
@@ -86,8 +86,12 @@ class LXQtFancyMenuAppMap
     bool rebuildModel(const XdgMenu &menu);
 
     void setFavorites(const QStringList& favorites);
+    QStringList getFavorites() const;
+
     int  getFavoriteIndex(const QString& desktopFile) const;
 
+    inline int getFavoriteCount() const { return mCategories[0].apps.count(); }
+
     inline bool isFavorite(const QString& desktopFile) const
     {
         return getFavoriteIndex(desktopFile) != -1;

diff --git a/plugin-fancymenu/lxqtfancymenuwindow.cpp b/plugin-fancymenu/lxqtfancymenuwindow.cpp
@@ -411,7 +411,7 @@ void LXQtFancyMenuWindow::setCurrentCategory(int cat)
         setSearchQuery(QString());
 
         // show or hide the label for empty Favorites
-        if (cat == LXQtFancyMenuAppMap::FavoritesCategory && mFavorites.isEmpty())
+        if (cat == LXQtFancyMenuAppMap::FavoritesCategory && mAppMap->getFavoriteCount() == 0)
         {
             showFavoritesLabel = true;
         }
@@ -579,8 +579,6 @@ void LXQtFancyMenuWindow::runCommandHelper(const QString &cmd)
 
 void LXQtFancyMenuWindow::addToFavorites(const QString &desktopFile)
 {
-    mFavorites.append(desktopFile);
-
     mAppModel->reloadAppMap(false);
     mAppMap->addToFavorites(desktopFile);
     mAppModel->reloadAppMap(true);
@@ -590,12 +588,11 @@ void LXQtFancyMenuWindow::addToFavorites(const QString &desktopFile)
 
 void LXQtFancyMenuWindow::removeFromFavorites(const QString &desktopFile)
 {
-    mFavorites.removeOne(desktopFile);
     mAppModel->reloadAppMap(false);
     mAppMap->removeFromFavorites(desktopFile);
     mAppModel->reloadAppMap(true);
 
-    if (mFavorites.isEmpty())
+    if (mAppMap->getFavoriteCount() == 0)
     {
         auto idx = mCategoryView->currentIndex();
         if (idx.row() == LXQtFancyMenuAppMap::FavoritesCategory
@@ -669,14 +666,13 @@ void LXQtFancyMenuWindow::setCustomFont(const QFont &f)
 
 QStringList LXQtFancyMenuWindow::favorites() const
 {
-    return mFavorites;
+    return mAppMap->getFavorites();
 }
 
 void LXQtFancyMenuWindow::setFavorites(const QStringList &newFavorites)
 {
-    mFavorites = newFavorites;
     mAppModel->reloadAppMap(false);
-    mAppMap->setFavorites(mFavorites);
+    mAppMap->setFavorites(newFavorites);
     mAppModel->reloadAppMap(true);
 }
 

diff --git a/plugin-fancymenu/lxqtfancymenuwindow.h b/plugin-fancymenu/lxqtfancymenuwindow.h
@@ -127,8 +127,6 @@ private slots:
     static const int APP_VIEW_STRETCH = 3;
     static const int CAT_VIEW_STRETCH = 2;
 
-    QStringList mFavorites;
-
     QVBoxLayout *mMainLayout;
     QHBoxLayout *mButtonsLayout;
     QHBoxLayout *mViewLayout;