From 79d2052a8323b374b9c60ef3f4baaad9084aff3b Mon Sep 17 00:00:00 2001 From: John Preston Date: Mon, 17 Jan 2022 15:04:28 +0300 Subject: [PATCH] Use default font in window title on macOS. --- ui/platform/mac/ui_window_title_mac.mm | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/ui/platform/mac/ui_window_title_mac.mm b/ui/platform/mac/ui_window_title_mac.mm index d768122..c660934 100644 --- a/ui/platform/mac/ui_window_title_mac.mm +++ b/ui/platform/mac/ui_window_title_mac.mm @@ -9,6 +9,7 @@ #include "ui/widgets/buttons.h" #include "ui/widgets/shadow.h" #include "ui/ui_utility.h" +#include "base/debug_log.h" #include "styles/style_widgets.h" #include "styles/palette.h" @@ -59,20 +60,29 @@ void TitleWidget::init(int height) { }, lifetime()); const auto families = QStringList{ - QString(".SF NS Text"), - QString("Helvetica Neue") + u".AppleSystemUIFont"_q, + u".SF NS Text"_q, + u"Helvetica Neue"_q, }; for (auto family : families) { _font.setFamily(family); if (QFontInfo(_font).family() == _font.family()) { + static const auto logged = [&] { + LOG(("Title Font: %1").arg(family)); + return true; + }(); break; } } - if (QFontInfo(_font).family() == _font.family()) { - _font.setPixelSize((height * 15) / 24); + if (QFontInfo(_font).family() != _font.family()) { + _font = st::semiboldFont; + _font.setPixelSize(13); + } else if (_font.family() == u".AppleSystemUIFont"_q) { + _font.setBold(true); + _font.setPixelSize(13); } else { - _font = st::normalFont; + _font.setPixelSize((height * 15) / 24); } }