From 4b0c4eee3048b6e8b13cbb44da5255ae898d0a6a Mon Sep 17 00:00:00 2001 From: John Preston Date: Thu, 17 Aug 2023 12:31:57 +0200 Subject: [PATCH] Use name instead of "My Story" if it doesn't fit. --- .../SourceFiles/dialogs/ui/dialogs_stories_content.cpp | 4 +--- Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp | 9 ++++++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp index ed723b55e..f737d1615 100644 --- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp +++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp @@ -347,9 +347,7 @@ Content State::next() { } result.elements.push_back({ .id = uint64(user->id.value), - .name = (user->isSelf() - ? tr::lng_stories_my_name(tr::now) - : user->shortName()), + .name = user->shortName(), .thumbnail = std::move(userpic), .count = info.count, .unreadCount = info.unreadCount, diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp index 82854b90b..cda8da94d 100644 --- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp +++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp @@ -671,7 +671,14 @@ void List::validateName(not_null item) { const auto &full = _st.full; const auto &font = full.nameStyle.font; const auto available = AvailableNameWidth(_st); - const auto text = Ui::Text::String(full.nameStyle, element.name); + const auto my = element.skipSmall + ? tr::lng_stories_my_name(tr::now) + : QString(); + const auto use = (my.isEmpty() + || full.nameStyle.font->width(my) > available) + ? element.name + : my; + const auto text = Ui::Text::String(full.nameStyle, use); const auto ratio = style::DevicePixelRatio(); item->nameCacheColor = color->c; item->nameCache = QImage(