From 8d1b33b9f13fd33d8a7ebf4384e6c2c9ccbb57a6 Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Mon, 1 Jun 2026 13:23:47 -0400 Subject: [PATCH] refactor: move fixed font to styleUtils, use this where fixed fonts are used --- src/lib/gui/StyleUtils.h | 16 ++++++++++++++++ src/lib/gui/widgets/FingerprintPreview.cpp | 8 +++----- src/lib/gui/widgets/LogWidget.cpp | 18 ++---------------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/lib/gui/StyleUtils.h b/src/lib/gui/StyleUtils.h index 76efb8930..40af74abc 100644 --- a/src/lib/gui/StyleUtils.h +++ b/src/lib/gui/StyleUtils.h @@ -8,6 +8,7 @@ #include #include +#include #include #include #include @@ -49,3 +50,18 @@ inline void updateIconTheme() QIcon::setFallbackSearchPaths({QStringLiteral(":/icons/%1").arg(themeName)}); } } // namespace deskflow::gui + +inline QFont fixedFont() +{ +#if defined(Q_OS_WIN) + QFont f({"Hack", "Liberation Mono", "Monospace", "Andale Mono"}); + f.setStyleHint(QFont::Monospace); +#else + QFont f = QFontDatabase::systemFont(QFontDatabase::FixedFont); +#endif + +#if defined(Q_OS_MAC) + f.setPointSize(12); +#endif + return f; +} diff --git a/src/lib/gui/widgets/FingerprintPreview.cpp b/src/lib/gui/widgets/FingerprintPreview.cpp index 749e25187..58344b228 100644 --- a/src/lib/gui/widgets/FingerprintPreview.cpp +++ b/src/lib/gui/widgets/FingerprintPreview.cpp @@ -10,6 +10,7 @@ #include #include +#include #include FingerprintPreview::FingerprintPreview( @@ -59,16 +60,13 @@ QLayout *FingerprintPreview::sha256Layout(const Fingerprint &fingerprint, const m_lblHash->setAlignment(Qt::AlignVCenter | Qt::AlignHCenter); m_lblHash->setTextInteractionFlags(Qt::TextSelectableByMouse); m_lblHash->setVisible(hashMode); + m_lblHash->setFont(fixedFont()); m_lblArt = new QLabel(deskflow::generateFingerprintArt(fingerprint.data), this); m_lblArt->setAlignment(Qt::AlignVCenter | Qt::AlignHCenter); m_lblArt->setTextInteractionFlags(Qt::TextSelectableByMouse); m_lblArt->setVisible(!hashMode); - - f = font(); - f.setFamilies({"Hack", "Liberation Mono", "Monospace", "Andale Mono"}); - f.setStyleHint(QFont::Monospace); - m_lblArt->setFont(f); + m_lblArt->setFont(fixedFont()); auto sha256Layout = new QVBoxLayout(); sha256Layout->setContentsMargins(0, 0, 0, 0); diff --git a/src/lib/gui/widgets/LogWidget.cpp b/src/lib/gui/widgets/LogWidget.cpp index f3d53b118..8ede9e93d 100644 --- a/src/lib/gui/widgets/LogWidget.cpp +++ b/src/lib/gui/widgets/LogWidget.cpp @@ -5,9 +5,9 @@ */ #include "LogWidget.h" -#include "common/PlatformInfo.h" #include +#include #include #include @@ -18,21 +18,7 @@ LogWidget::LogWidget(QWidget *parent) : QWidget{parent}, m_textLog{new QPlainTex m_textLog->setReadOnly(true); m_textLog->setMaximumBlockCount(10000); m_textLog->setLineWrapMode(QPlainTextEdit::NoWrap); - - // setup the log font - if (deskflow::platform::isWindows()) { - QFont f = font(); - f.setFamilies({"Hack", "Liberation Mono", "Monospace", "Andale Mono"}); - f.setStyleHint(QFont::Monospace); - m_textLog->setFont(f); - } else { - m_textLog->setFont(QFontDatabase::systemFont(QFontDatabase::FixedFont)); - if (deskflow::platform::isMac()) { - auto f = m_textLog->font(); - f.setPixelSize(12); - m_textLog->setFont(f); - } - } + m_textLog->setFont(fixedFont()); auto layout = new QVBoxLayout; layout->setContentsMargins(0, 0, 0, 0);