RepoMirrors/tdesktop
1
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-04-01 23:00:58 +00:00
Code Issues Projects Releases Wiki Activity

Display saved messages senders correctly.

Browse Source
This commit is contained in:
John Preston 2017-12-05 20:38:13 +04:00
parent 85d8273009
commit 8b3d203861
3 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Telegram/SourceFiles/dialogs/dialogs_layout.cpp
View File

@ -501,7 +501,9 @@ void RowPainter::paint(
auto cloudDraft = nullptr; auto cloudDraft = nullptr;
auto from = [&] { auto from = [&] {
if (auto searchPeer = row->searchInPeer()) { if (auto searchPeer = row->searchInPeer()) {
if (!searchPeer->isChannel() || searchPeer->isMegagroup()) { if (searchPeer->isSelf()) {
return item->senderOriginal();
} else if (!searchPeer->isChannel() || searchPeer->isMegagroup()) {
return item->from(); return item->from();
} }
} }

19
Telegram/SourceFiles/history/history_item.cpp
View File

@ -1234,12 +1234,19 @@ QString HistoryItem::inDialogsText(DrawInDialog way) const {
} }
return TextUtilities::Clean(_text.originalText()); return TextUtilities::Clean(_text.originalText());
}; };
auto plainText = getText(); const auto plainText = getText();
if ((!_history->peer->isUser() || out()) const auto sender = [&]() -> PeerData* {
&& !isPost() if (isPost() || isEmpty() || (way == DrawInDialog::WithoutSender)) {
&& !isEmpty() return nullptr;
&& (way != DrawInDialog::WithoutSender)) { } else if (!_history->peer->isUser() || out()) {
auto fromText = author()->isSelf() ? lang(lng_from_you) : author()->shortName(); return author();
} else if (_history->peer->isSelf() && !hasOutLayout()) {
return senderOriginal();
}
return nullptr;
}();
if (sender) {
auto fromText = sender->isSelf() ? lang(lng_from_you) : sender->shortName();
auto fromWrapped = textcmdLink(1, lng_dialogs_text_from_wrapped(lt_from, TextUtilities::Clean(fromText))); auto fromWrapped = textcmdLink(1, lng_dialogs_text_from_wrapped(lt_from, TextUtilities::Clean(fromText)));
return lng_dialogs_text_with_from(lt_from_part, fromWrapped, lt_message, plainText); return lng_dialogs_text_with_from(lt_from_part, fromWrapped, lt_message, plainText);
} }

6
Telegram/SourceFiles/history/history_message.cpp
View File

@ -1616,8 +1616,10 @@ int HistoryMessage::infoWidth() const {
if (auto views = Get<HistoryMessageViews>()) { if (auto views = Get<HistoryMessageViews>()) {
result += st::historyViewsSpace + views->_viewsWidth + st::historyViewsWidth; result += st::historyViewsSpace + views->_viewsWidth + st::historyViewsWidth;
} else if (id < 0 && history()->peer->isSelf()) { } else if (id < 0 && history()->peer->isSelf()) {
if (!hasOutLayout()) {
result += st::historySendStateSpace; result += st::historySendStateSpace;
} }
}
if (hasOutLayout()) { if (hasOutLayout()) {
result += st::historySendStateSpace; result += st::historySendStateSpace;
} }
@ -1629,8 +1631,10 @@ int HistoryMessage::timeLeft() const {
if (auto views = Get<HistoryMessageViews>()) { if (auto views = Get<HistoryMessageViews>()) {
result += st::historyViewsSpace + views->_viewsWidth + st::historyViewsWidth; result += st::historyViewsSpace + views->_viewsWidth + st::historyViewsWidth;
} else if (id < 0 && history()->peer->isSelf()) { } else if (id < 0 && history()->peer->isSelf()) {
if (!hasOutLayout()) {
result += st::historySendStateSpace; result += st::historySendStateSpace;
} }
}
return result; return result;
} }
@ -1697,7 +1701,7 @@ void HistoryMessage::drawInfo(Painter &p, int32 right, int32 bottom, int32 width
auto iconSkip = st::historyViewsSpace + views->_viewsWidth; auto iconSkip = st::historyViewsSpace + views->_viewsWidth;
icon->paint(p, infoRight - infoW + iconSkip, infoBottom + st::historyViewsTop, width); icon->paint(p, infoRight - infoW + iconSkip, infoBottom + st::historyViewsTop, width);
} }
} else if (id < 0 && history()->peer->isSelf()) { } else if (id < 0 && history()->peer->isSelf() && !outbg) {
auto icon = &(invertedsprites ? st::historyViewsSendingInvertedIcon : st::historyViewsSendingIcon); auto icon = &(invertedsprites ? st::historyViewsSendingInvertedIcon : st::historyViewsSendingIcon);
icon->paint(p, infoRight - infoW, infoBottom + st::historyViewsTop, width); icon->paint(p, infoRight - infoW, infoBottom + st::historyViewsTop, width);
} }