FancyMenu: fix custom font size not applied

lxqt · Jan 14, 2024 · 3ce8762 · 3ce8762
1 parent 2ec1280
commit 3ce8762
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/plugin-fancymenu/lxqtfancymenu.cpp b/plugin-fancymenu/lxqtfancymenu.cpp
@@ -286,19 +286,14 @@ void LXQtFancyMenu::setMenuFontSize()
 
     QFont menuFont = mButton.font();
     bool customFont = settings()->value(QStringLiteral("customFont"), false).toBool();
+    int customFontSize = settings()->value(QStringLiteral("customFontSize")).toInt();
 
     if(customFont)
     {
         menuFont = mWindow->font();
-        menuFont.setPointSize(settings()->value(QStringLiteral("customFontSize")).toInt());
+        menuFont.setPointSize(customFontSize);
+        mWindow->setCustomFont(menuFont);
     }
-
-    if (mWindow->font() != menuFont)
-    {
-        mWindow->setFont(menuFont);
-    }
-
-    // FIXME: font is not really changing, what about icon sizes?
 }
 
 /************************************************

diff --git a/plugin-fancymenu/lxqtfancymenuwindow.cpp b/plugin-fancymenu/lxqtfancymenuwindow.cpp
@@ -500,6 +500,13 @@ void LXQtFancyMenuWindow::setSearchEditFocus()
     mSearchEdit->setFocus();
 }
 
+void LXQtFancyMenuWindow::setCustomFont(const QFont &f)
+{
+    mAppView->setFont(f);
+    mCategoryView->setFont(f);
+    mSearchEdit->setFont(f);
+}
+
 QStringList LXQtFancyMenuWindow::favorites() const
 {
     return mFavorites;

diff --git a/plugin-fancymenu/lxqtfancymenuwindow.h b/plugin-fancymenu/lxqtfancymenuwindow.h
@@ -75,6 +75,8 @@ class LXQtFancyMenuWindow : public QWidget
 
     void setSearchEditFocus();
 
+    void setCustomFont(const QFont& f);
+
 signals:
     void aboutToShow();
     void aboutToHide();