diff --git a/Telegram/Resources/icons/mac_window_shadow_top_left.png b/Telegram/Resources/icons/mac_window_shadow_top_left.png index bcf9c04516..b4688aad69 100644 Binary files a/Telegram/Resources/icons/mac_window_shadow_top_left.png and b/Telegram/Resources/icons/mac_window_shadow_top_left.png differ diff --git a/Telegram/Resources/icons/mac_window_shadow_top_left@2x.png b/Telegram/Resources/icons/mac_window_shadow_top_left@2x.png index 71bb8ddfa3..69627c1eef 100644 Binary files a/Telegram/Resources/icons/mac_window_shadow_top_left@2x.png and b/Telegram/Resources/icons/mac_window_shadow_top_left@2x.png differ diff --git a/Telegram/Resources/icons/mac_window_shadow_top_left@3x.png b/Telegram/Resources/icons/mac_window_shadow_top_left@3x.png index 6561ede861..4c6671312c 100644 Binary files a/Telegram/Resources/icons/mac_window_shadow_top_left@3x.png and b/Telegram/Resources/icons/mac_window_shadow_top_left@3x.png differ diff --git a/Telegram/SourceFiles/platform/mac/window_title_mac.mm b/Telegram/SourceFiles/platform/mac/window_title_mac.mm index 8843d56a7d..c8002c05ce 100644 --- a/Telegram/SourceFiles/platform/mac/window_title_mac.mm +++ b/Telegram/SourceFiles/platform/mac/window_title_mac.mm @@ -52,21 +52,27 @@ void PreviewWindowTitle(Painter &p, const style::palette &palette, QRect body, i p.fillRect(titleRect, st::titleBgActive[palette]); p.fillRect(titleRect.x(), titleRect.y() + titleRect.height() - st::lineWidth, titleRect.width(), st::lineWidth, st::titleShadow[palette]); - auto useSystemFont = false; QFont font; - QStringList families = { qsl(".SF NS Text"), qsl("Helvetica Neue") }; + const auto families = QStringList{ + 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()) { - useSystemFont = true; break; } } - if (useSystemFont) { - font.setPixelSize((titleHeight * 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((titleHeight * 15) / 24); } p.setPen(st::titleFgActive[palette]); diff --git a/Telegram/SourceFiles/window/window.style b/Telegram/SourceFiles/window/window.style index a6278553db..8a61c1aae2 100644 --- a/Telegram/SourceFiles/window/window.style +++ b/Telegram/SourceFiles/window/window.style @@ -351,6 +351,6 @@ macAlwaysThisAppTop: 4; macAppHintTop: 8; macCautionIconSize: 16; -macWindowRoundRadius: 5; +macWindowRoundRadius: 10; macWindowShadowTopLeft: icon {{ "mac_window_shadow_top_left", windowShadowFg }}; macTrayIcon: icon {{ "mac_tray_icon", windowFg }}; diff --git a/Telegram/lib_ui b/Telegram/lib_ui index 220d683528..79d2052a83 160000 --- a/Telegram/lib_ui +++ b/Telegram/lib_ui @@ -1 +1 @@ -Subproject commit 220d6835283c51c6e529ad5ef2f100703098e270 +Subproject commit 79d2052a8323b374b9c60ef3f4baaad9084aff3b