From 1f194da2f07a5388dd4ec400a899f237d0b93e2f Mon Sep 17 00:00:00 2001 From: John Preston Date: Mon, 17 Jan 2022 16:48:32 +0300 Subject: [PATCH] Improve macOS title bar font and rounding. --- .../icons/mac_window_shadow_top_left.png | Bin 823 -> 3430 bytes .../icons/mac_window_shadow_top_left@2x.png | Bin 1979 -> 7448 bytes .../icons/mac_window_shadow_top_left@3x.png | Bin 4287 -> 10845 bytes .../platform/mac/window_title_mac.mm | 18 ++++++++++++------ Telegram/SourceFiles/window/window.style | 2 +- Telegram/lib_ui | 2 +- 6 files changed, 14 insertions(+), 8 deletions(-) diff --git a/Telegram/Resources/icons/mac_window_shadow_top_left.png b/Telegram/Resources/icons/mac_window_shadow_top_left.png index bcf9c04516c62f496edceb191f3ce328f4c8a996..b4688aad691362d06cd2bb932e6b1cdf05b49750 100644 GIT binary patch literal 3430 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 delta 811 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 DIs2IV delta 1976 zcmV;p2S@mrI=c^$8Gi-<0072_5w-vT2ZBjNK~#90?Va0l;y4sVg$)&;sE{Y}|6khk zGVWqL#@5lfZP|NObwOJfD`;_agXC07`BMl@T5<>xQ9Bm3T^a0JM5K;JY6~K}6fwKgv+v&{ zyAm-|fS%+-Z0l}BjDB$uIuoG{R&+07WM>>v_9(g*F{-0H?{g&C*632ih|cr6M~~t~ zw7EMGyrwPlIufxL0U1f#=t4yFIa=>g6ajbYHXFb`#h}fHi()!Wnms+gb z1R-Mf_D5|QPf=UTMAqj?x`>$)S_^peD5)V`L@PX^Re#T-M%HOTs)!le8#VbO^R(o( zEQ>;#h|v;SMJ;W*G@mqYW}O;RL`0O(TR^YjTU!o=a1qfY)TCR;mk}8er41D^QbMf+ z9%&ZsvMhtZ)b215ktB>3FnidxD(^`*+c%jKO0R3uBzao$w&Hz{5D}x^$<|_63K%J- zMY(9)MSt9rgh&xnk}s+r4bVfgr-T^-wg_93-kR46i+j3?=zUty+JRcxGNWZpx>cD- zAS0sZaIO&xQOepp5p`&A5ixTW=P?vViKsAv8E);wF+ zx6&keYUyT<=s6^#ONcI{B%cK>_ezh5)&g5gSd%t?Y`yQNYirlH(pvIaQ*+;R5x4MO zgh-{Eo}W&qG7Li*hM|n(ScYNvdtDnXCD$bB(tMGai0HLy^OUev&`H3{{Zu}Iamae}% zRa>`}gy-|QJRXnodcDf|4ErAL67{R;F$8F$p=Ts~JRaru_jk4Jq>VvSID1PVLc&r? z8HSo2VxK(Y=Tq$i<3nFX3@KIL{*)hUaxK8pZ)PG+S)X)Lg3(w5AQj z22n)xI^n3TUm6YP*J|2R6D^57)e$kHLoA}9baArwNc>2dBWmY{l2!7jG)jmC%pB2j zpKyL{OR7)zri^iP@w;zYw`jKNTYnOe66OH$dBn(Q*s^~}8U0D!N0g#jpseNlbfQAy zNdI80cFU$^OQtptH?`w1kBHh%v)(J@P}~PFtL7y%3zODJIUk-G5o3UwBer(9brhs{ z@l-`bi;mGmv|348w{DgeDU67*Y(_-XPLOU^Z@m#15p!9Mh-e+6*{uGQwtx1V5iyRC zU(_kx#MYjkNalt$_apv5ubQ`z9LKdp!})XK2h^&04XYLP{Msi0HTNWPAR?lq!)q5M zpH{_7^{h=3r0pYZKz|-lI@H#bm&nLrISzLbr5)L_IFZ&-J2aCx(ud})p?2+B%@A5E z;JgeME3t$R&DxWZrF@boYJa&+MC?fYs{$Tqj}q6SBk==%`$n^{(X5gwU@Y(=PH5(m zOV_zYgN5s2#c~sRo@OzhT-w0q(40ePMD*@Zs|{-o&GDpe-)N81B+;?P?Apcs3T(JCbdNyq;o+^ z7z5PbYqnabw9Y>{N6aIA)oj(-(vuNNhQ;pp5hrR-QfkW*TcE!@<-eP~|7 z`m={ydEe70UJj5V&VRAmhS|#VE+ZE!v84Z*+>HBr93v7P&=Ju>0PYX=0knuMNH@26 zs)9kcB3hiLwA4j>=vKscEI)Io{rUoFV{x&9+yS0#o3ENl9RCxsrw))tuhyTfr`M!c z{xdWm;RQd!&)6g3e|f5QI|b$2bQCv+zasAK1?Ty3U+iMl+F zy#nT&C5GLJNc!YZA~L$+vP%&uTz~9RMA9E!iRk&QK9UREpUEZ1q^pQX_6tQM5FAp( z+Am#kS`i0?h%xMN0wE$HaGys+fxqz~mR&@|7Eve~7P}CU^v^%H&=Q-vInMe30000< KMNUMnLSTYm0Kvil 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 6561ede861785f12bc533caa49ae522e4ee375c6..4c6671312c66ae5b3a8cff3eacb9ae66d65d38f6 100644 GIT binary patch literal 10845 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

WtTrM)i-cRam|H%2UgT6N{m@Hpbza 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 literal 4287 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 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