RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use name instead of "My Story" if it doesn't fit.

This commit is contained in:
John Preston 2023-08-17 12:31:57 +02:00
parent 5dcca4482a
commit 4b0c4eee30
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp
View File

@ -347,9 +347,7 @@ Content State::next() {
} }
result.elements.push_back({ result.elements.push_back({
.id = uint64(user->id.value), .id = uint64(user->id.value),
.name = (user->isSelf() .name = user->shortName(),
? tr::lng_stories_my_name(tr::now)
: user->shortName()),
.thumbnail = std::move(userpic), .thumbnail = std::move(userpic),
.count = info.count, .count = info.count,
.unreadCount = info.unreadCount, .unreadCount = info.unreadCount,

9
Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
View File

@ -671,7 +671,14 @@ void List::validateName(not_null<Item*> item) {
const auto &full = _st.full; const auto &full = _st.full;
const auto &font = full.nameStyle.font; const auto &font = full.nameStyle.font;
const auto available = AvailableNameWidth(_st); 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(); const auto ratio = style::DevicePixelRatio();
item->nameCacheColor = color->c; item->nameCacheColor = color->c;
item->nameCache = QImage( item->nameCache = QImage(