Fixed sender name for voices in overview layout when sender is hidden.

This commit is contained in:
23rd 2024-05-14 04:04:07 +03:00
parent c1c49e8ddc
commit b406e2b99b
2 changed files with 14 additions and 21 deletions

View file

@ -3826,7 +3826,7 @@ void Message::fromNameUpdated(int width) const {
const auto nameText = [&]() -> const Ui::Text::String * { const auto nameText = [&]() -> const Ui::Text::String * {
if (from) { if (from) {
return &_fromName; return &_fromName;
} else if (const auto info= item->originalHiddenSenderInfo()) { } else if (const auto info = item->originalHiddenSenderInfo()) {
return &info->nameText(); return &info->nameText();
} else { } else {
Unexpected("Corrupted forwarded information in message."); Unexpected("Corrupted forwarded information in message.");

View file

@ -13,7 +13,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "data/data_document_resolver.h" #include "data/data_document_resolver.h"
#include "data/data_session.h" #include "data/data_session.h"
#include "data/data_web_page.h" #include "data/data_web_page.h"
#include "data/data_media_types.h"
#include "data/data_peer.h" #include "data/data_peer.h"
#include "data/data_photo_media.h" #include "data/data_photo_media.h"
#include "data/data_document_media.h" #include "data/data_document_media.h"
@ -21,9 +20,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "ui/boxes/confirm_box.h" #include "ui/boxes/confirm_box.h"
#include "lang/lang_keys.h" #include "lang/lang_keys.h"
#include "layout/layout_selection.h" #include "layout/layout_selection.h"
#include "mainwidget.h"
#include "storage/file_upload.h" #include "storage/file_upload.h"
#include "mainwindow.h"
#include "main/main_session.h" #include "main/main_session.h"
#include "media/audio/media_audio.h" #include "media/audio/media_audio.h"
#include "media/player/media_player_instance.h" #include "media/player/media_player_instance.h"
@ -999,23 +996,19 @@ const style::RoundCheckbox &Voice::checkboxStyle() const {
void Voice::updateName() { void Voice::updateName() {
if (const auto forwarded = parent()->Get<HistoryMessageForwarded>()) { if (const auto forwarded = parent()->Get<HistoryMessageForwarded>()) {
if (parent()->fromOriginal()->isChannel()) { const auto info = parent()->originalHiddenSenderInfo();
_name.setText( const auto name = info
st::semiboldTextStyle, ? tr::lng_forwarded(tr::now, lt_user, info->nameText().toString())
tr::lng_forwarded_channel( : parent()->fromOriginal()->isChannel()
tr::now, ? tr::lng_forwarded_channel(
lt_channel, tr::now,
parent()->fromOriginal()->name()), lt_channel,
Ui::NameTextOptions()); parent()->fromOriginal()->name())
} else { : tr::lng_forwarded(
_name.setText( tr::now,
st::semiboldTextStyle, lt_user,
tr::lng_forwarded( parent()->fromOriginal()->name());
tr::now, _name.setText(st::semiboldTextStyle, name, Ui::NameTextOptions());
lt_user,
parent()->fromOriginal()->name()),
Ui::NameTextOptions());
}
} else { } else {
_name.setText( _name.setText(
st::semiboldTextStyle, st::semiboldTextStyle,