From b843f91b3c94273846b3eec38194baf6e4024aa4 Mon Sep 17 00:00:00 2001 From: John Preston Date: Mon, 10 Mar 2025 11:52:42 +0400 Subject: [PATCH] Support 'FT' "country" flag emoji. --- Telegram/SourceFiles/countries/countries_instance.cpp | 3 +++ Telegram/SourceFiles/history/view/history_view_about_view.cpp | 1 + Telegram/SourceFiles/ui/chat/chat.style | 1 + 3 files changed, 5 insertions(+) diff --git a/Telegram/SourceFiles/countries/countries_instance.cpp b/Telegram/SourceFiles/countries/countries_instance.cpp index ba159016d..d9ef7c3c7 100644 --- a/Telegram/SourceFiles/countries/countries_instance.cpp +++ b/Telegram/SourceFiles/countries/countries_instance.cpp @@ -322,6 +322,9 @@ QString CountriesInstance::flagEmojiByISO2(const QString &iso) const { || iso.back() < 'A' || iso.back() > 'Z') { return QString(); + } else if (iso == u"FT"_q) { + return QString::fromUtf8( + "\xF0\x9F\x8F\xB4\xE2\x80\x8D\xE2\x98\xA0\xEF\xB8\x8F"); } auto result = QString(4, QChar(0xD83C)); result[1] = QChar(iso.front().unicode() - 'A' + 0xDDE6); diff --git a/Telegram/SourceFiles/history/view/history_view_about_view.cpp b/Telegram/SourceFiles/history/view/history_view_about_view.cpp index d2ad1b735..486bcd984 100644 --- a/Telegram/SourceFiles/history/view/history_view_about_view.cpp +++ b/Telegram/SourceFiles/history/view/history_view_about_view.cpp @@ -748,6 +748,7 @@ AdminLog::OwnedItem AboutView::makeNewPeerInfo(not_null user) { owned.get(), GenerateNewPeerInfo(owned.get(), _item.get(), user, _commonGroups), HistoryView::MediaGenericDescriptor{ + .maxWidth = st::newPeerWidth, .service = true, .hideServiceText = true, })); diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style index eba8783e0..1b0c786e9 100644 --- a/Telegram/SourceFiles/ui/chat/chat.style +++ b/Telegram/SourceFiles/ui/chat/chat.style @@ -1244,3 +1244,4 @@ newPeerUserpics: GroupCallUserpics { align: align(left); } newPeerUserpicsPadding: margins(0px, 3px, 0px, 0px); +newPeerWidth: 320px;