RepoMirrors/tdesktop
1
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-03-22 11:18:44 +00:00
Code Issues Projects Releases Wiki Activity

Fix via @bot display in Saved Messages.

Browse Source 
Fixes #5034.
This commit is contained in:
John Preston 2018-08-02 16:19:03 +03:00
parent 6c7c442ad2
commit 7f16675d2f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Telegram/SourceFiles/history/view/history_view_message.cpp
View File

@ -526,10 +526,10 @@ void Message::paintFromName(
if (item->isPost()) { if (item->isPost()) {
p.setPen(selected ? st::msgInServiceFgSelected : st::msgInServiceFg); p.setPen(selected ? st::msgInServiceFgSelected : st::msgInServiceFg);
} else { } else {
p.setPen(FromNameFg(item->author(), selected)); p.setPen(FromNameFg(item->displayFrom(), selected));
} }
item->displayFrom()->nameText.drawElided(p, availableLeft, trect.top(), availableWidth); item->displayFrom()->nameText.drawElided(p, availableLeft, trect.top(), availableWidth);
auto skipWidth = item->author()->nameText.maxWidth() + st::msgServiceFont->spacew; auto skipWidth = item->displayFrom()->nameText.maxWidth() + st::msgServiceFont->spacew;
availableLeft += skipWidth; availableLeft += skipWidth;
availableWidth -= skipWidth; availableWidth -= skipWidth;
@ -861,7 +861,7 @@ bool Message::getStateFromName(
auto via = item->Get<HistoryMessageVia>(); auto via = item->Get<HistoryMessageVia>();
if (via if (via
&& !displayForwardedFrom() && !displayForwardedFrom()
&& point.x() >= availableLeft + item->author()->nameText.maxWidth() + st::msgServiceFont->spacew && point.x() >= availableLeft + item->displayFrom()->nameText.maxWidth() + st::msgServiceFont->spacew
&& point.x() < availableLeft + availableWidth && point.x() < availableLeft + availableWidth
&& point.x() < availableLeft + user->nameText.maxWidth() + st::msgServiceFont->spacew + via->width) { && point.x() < availableLeft + user->nameText.maxWidth() + st::msgServiceFont->spacew + via->width) {
outResult->link = via->link; outResult->link = via->link;
@ -1514,7 +1514,7 @@ void Message::fromNameUpdated(int width) const {
via->resize(width via->resize(width
- st::msgPadding.left() - st::msgPadding.left()
- st::msgPadding.right() - st::msgPadding.right()
- item->author()->nameText.maxWidth() - item->displayFrom()->nameText.maxWidth()
- st::msgServiceFont->spacew); - st::msgServiceFont->spacew);
} }
} }