Skip to content

Commit 3ce8762

Browse files
committed
FancyMenu: fix custom font size not applied
1 parent 2ec1280 commit 3ce8762

File tree

3 files changed

+12
-8
lines changed

3 files changed

+12
-8
lines changed

plugin-fancymenu/lxqtfancymenu.cpp

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -286,19 +286,14 @@ void LXQtFancyMenu::setMenuFontSize()
286286

287287
QFont menuFont = mButton.font();
288288
bool customFont = settings()->value(QStringLiteral("customFont"), false).toBool();
289+
int customFontSize = settings()->value(QStringLiteral("customFontSize")).toInt();
289290

290291
if(customFont)
291292
{
292293
menuFont = mWindow->font();
293-
menuFont.setPointSize(settings()->value(QStringLiteral("customFontSize")).toInt());
294+
menuFont.setPointSize(customFontSize);
295+
mWindow->setCustomFont(menuFont);
294296
}
295-
296-
if (mWindow->font() != menuFont)
297-
{
298-
mWindow->setFont(menuFont);
299-
}
300-
301-
// FIXME: font is not really changing, what about icon sizes?
302297
}
303298

304299
/************************************************

plugin-fancymenu/lxqtfancymenuwindow.cpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -500,6 +500,13 @@ void LXQtFancyMenuWindow::setSearchEditFocus()
500500
mSearchEdit->setFocus();
501501
}
502502

503+
void LXQtFancyMenuWindow::setCustomFont(const QFont &f)
504+
{
505+
mAppView->setFont(f);
506+
mCategoryView->setFont(f);
507+
mSearchEdit->setFont(f);
508+
}
509+
503510
QStringList LXQtFancyMenuWindow::favorites() const
504511
{
505512
return mFavorites;

plugin-fancymenu/lxqtfancymenuwindow.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,8 @@ class LXQtFancyMenuWindow : public QWidget
7575

7676
void setSearchEditFocus();
7777

78+
void setCustomFont(const QFont& f);
79+
7880
signals:
7981
void aboutToShow();
8082
void aboutToHide();

0 commit comments

Comments
 (0)