From 788bd114cc3451ee97c2089d5034db3a6f4e3131 Mon Sep 17 00:00:00 2001 From: Dan Paulat Date: Tue, 1 Jul 2025 00:15:54 -0500 Subject: [PATCH] Update title font sizes for macOS --- scwx-qt/source/scwx/qt/ui/about_dialog.cpp | 12 +++++++++--- scwx-qt/source/scwx/qt/ui/update_dialog.cpp | 12 +++++++++--- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/scwx-qt/source/scwx/qt/ui/about_dialog.cpp b/scwx-qt/source/scwx/qt/ui/about_dialog.cpp index bc24d056..9ae6ce18 100644 --- a/scwx-qt/source/scwx/qt/ui/about_dialog.cpp +++ b/scwx-qt/source/scwx/qt/ui/about_dialog.cpp @@ -24,13 +24,19 @@ AboutDialog::AboutDialog(QWidget* parent) : p {std::make_unique()}, ui(new Ui::AboutDialog) { +#if !defined(__APPLE__) + static constexpr int titleFontSize = 14; +#else + static constexpr int titleFontSize = 18; +#endif + ui->setupUi(this); - int titleFontId = + const int titleFontId = manager::FontManager::Instance().GetFontId(types::Font::din1451alt_g); - QString titleFontFamily = + const QString titleFontFamily = QFontDatabase::applicationFontFamilies(titleFontId).at(0); - QFont titleFont(titleFontFamily, 14); + const QFont titleFont(titleFontFamily, titleFontSize); ui->titleLabel->setFont(titleFont); QString repositoryUrl = diff --git a/scwx-qt/source/scwx/qt/ui/update_dialog.cpp b/scwx-qt/source/scwx/qt/ui/update_dialog.cpp index 0ca61a18..6473a30b 100644 --- a/scwx-qt/source/scwx/qt/ui/update_dialog.cpp +++ b/scwx-qt/source/scwx/qt/ui/update_dialog.cpp @@ -42,13 +42,19 @@ public: UpdateDialog::UpdateDialog(QWidget* parent) : QDialog(parent), p {std::make_unique(this)}, ui(new Ui::UpdateDialog) { +#if !defined(__APPLE__) + static constexpr int titleFontSize = 12; +#else + static constexpr int titleFontSize = 16; +#endif + ui->setupUi(this); - int titleFontId = + const int titleFontId = manager::FontManager::Instance().GetFontId(types::Font::din1451alt_g); - QString titleFontFamily = + const QString titleFontFamily = QFontDatabase::applicationFontFamilies(titleFontId).at(0); - QFont titleFont(titleFontFamily, 12); + const QFont titleFont(titleFontFamily, titleFontSize); ui->bannerLabel->setFont(titleFont); ui->releaseNotesText->setOpenExternalLinks(true);