From 7f16675d2f36d708ed40b2fcf4e3794c509a59d4 Mon Sep 17 00:00:00 2001 From: John Preston Date: Thu, 2 Aug 2018 16:19:03 +0300 Subject: [PATCH] Fix via @bot display in Saved Messages. Fixes #5034. --- .../SourceFiles/history/view/history_view_message.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Telegram/SourceFiles/history/view/history_view_message.cpp b/Telegram/SourceFiles/history/view/history_view_message.cpp index acc6544f3a..500d09bb65 100644 --- a/Telegram/SourceFiles/history/view/history_view_message.cpp +++ b/Telegram/SourceFiles/history/view/history_view_message.cpp @@ -526,10 +526,10 @@ void Message::paintFromName( if (item->isPost()) { p.setPen(selected ? st::msgInServiceFgSelected : st::msgInServiceFg); } else { - p.setPen(FromNameFg(item->author(), selected)); + p.setPen(FromNameFg(item->displayFrom(), selected)); } 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; availableWidth -= skipWidth; @@ -861,7 +861,7 @@ bool Message::getStateFromName( auto via = item->Get(); if (via && !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 + user->nameText.maxWidth() + st::msgServiceFont->spacew + via->width) { outResult->link = via->link; @@ -1514,7 +1514,7 @@ void Message::fromNameUpdated(int width) const { via->resize(width - st::msgPadding.left() - st::msgPadding.right() - - item->author()->nameText.maxWidth() + - item->displayFrom()->nameText.maxWidth() - st::msgServiceFont->spacew); } }