void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-05 06:33:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix name width in accounts list. Fixes #25116.

Browse source
This commit is contained in:
John Preston 2022-10-14 12:01:53 +04:00
parent b68ffcd75d
commit 9b0cae9c97
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Telegram/SourceFiles/settings/settings_information.cpp
View file

@ -134,22 +134,25 @@ ComposedBadge::ComposedBadge(
} }
}, lifetime()); }, lifetime());
auto textWidth = _text.value() | rpl::map([=] {
return button->fullTextWidth();
});
rpl::combine( rpl::combine(
_unreadWidth.events_starting_with(_unread ? _unread->width() : 0), _unreadWidth.events_starting_with(_unread ? _unread->width() : 0),
_premiumWidth.events_starting_with(_badge.widget() _premiumWidth.events_starting_with(_badge.widget()
? _badge.widget()->width() ? _badge.widget()->width()
: 0), : 0),
_text.value(), std::move(textWidth),
button->sizeValue() button->sizeValue()
) | rpl::start_with_next([=]( ) | rpl::start_with_next([=](
int unreadWidth, int unreadWidth,
int premiumWidth, int premiumWidth,
const QString &text, int textWidth,
const QSize &buttonSize) { const QSize &buttonSize) {
const auto &st = button->st(); const auto &st = button->st();
const auto skip = st.style.font->spacew; const auto skip = st.style.font->spacew;
const auto textRightPosition = st.padding.left() const auto textRightPosition = st.padding.left()
+ st.style.font->width(text) + textWidth
+ skip; + skip;
const auto minWidth = unreadWidth + premiumWidth + skip; const auto minWidth = unreadWidth + premiumWidth + skip;
const auto maxTextWidth = buttonSize.width() const auto maxTextWidth = buttonSize.width()

2
Telegram/lib_ui

@ -1 +1 @@
Subproject commit f450dcf2c5fa1dfa0ad1fda483421c6548ff4fbb Subproject commit 9ab11ccb36b7d03a3a24ebcd18d2f13b03fc3682