From bf9d90ca4ee35ecb3534b3ee9ced0bc0fb7e0812 Mon Sep 17 00:00:00 2001 From: 23rd <23rd@vivaldi.net> Date: Mon, 9 Sep 2024 10:40:01 +0300 Subject: [PATCH] Fixed emoji display in header of link for dialog filters. --- .../boxes/filters/edit_filter_links.cpp | 2 +- Telegram/SourceFiles/settings/settings.style | 4 ++-- .../ui/controls/filter_link_header.cpp | 23 ++++++++++++++----- 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp b/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp index 7dc09ae3a..e86b0811f 100644 --- a/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp +++ b/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp @@ -1114,7 +1114,7 @@ QString FilterChatStatusText(not_null peer) { ? tr::lng_chat_status_subscribers : tr::lng_chat_status_members)( tr::now, - lt_count, + lt_count_decimal, channel->membersCount()); } } diff --git a/Telegram/SourceFiles/settings/settings.style b/Telegram/SourceFiles/settings/settings.style index 094af51db..cff0d7f38 100644 --- a/Telegram/SourceFiles/settings/settings.style +++ b/Telegram/SourceFiles/settings/settings.style @@ -560,9 +560,9 @@ filterLinkPreviewRadius: 13px; filterLinkPreviewTop: 30px; filterLinkPreviewColumn: 65px; filterLinkPreviewAllBottom: 18px; -filterLinkPreviewAllTop: 17px; +filterLinkPreviewAllTop: 15px; filterLinkPreviewMyBottom: 74px; -filterLinkPreviewMyTop: 73px; +filterLinkPreviewMyTop: 71px; filterLinkPreviewChatSize: 36px; filterLinkPreviewChatSkip: 10px; filterLinkPreviewBadgeLeft: 40px; diff --git a/Telegram/SourceFiles/ui/controls/filter_link_header.cpp b/Telegram/SourceFiles/ui/controls/filter_link_header.cpp index 099720ae1..0d69c0efd 100644 --- a/Telegram/SourceFiles/ui/controls/filter_link_header.cpp +++ b/Telegram/SourceFiles/ui/controls/filter_link_header.cpp @@ -105,11 +105,22 @@ private: icon->paint(p, iconLeft, myIconTop, size); const auto paintName = [&](const QString &text, int top) { - const auto &font = st.style.font; - p.drawText( - QRect(0, top, column, font->height), - font->elided(text, available), - style::al_top); + auto string = Ui::Text::String( + st.style, + text, + kDefaultTextOptions, + available); + string.draw(p, { + .position = QPoint( + std::max( + (column - string.maxWidth()) / 2, + skip), + top), + .outerWidth = available, + .availableWidth = available, + .align = style::al_left, + .elisionLines = 1, + }); }; p.setFont(st.style.font); p.setPen(st.textFg); @@ -456,4 +467,4 @@ object_ptr FilterLinkProcessButton( return result; } -} // namespace Ui \ No newline at end of file +} // namespace Ui