RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Display correct info in pinned message.

This commit is contained in:
John Preston 2018-06-28 16:27:50 +01:00
parent 98930792c3
commit ea6e4c6006
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5502,7 +5502,7 @@ void HistoryWidget::updatePinnedBar(bool force) {
if (_pinnedBar->msg) { if (_pinnedBar->msg) {
_pinnedBar->text.setText( _pinnedBar->text.setText(
st::messageTextStyle, st::messageTextStyle,
TextUtilities::Clean(_pinnedBar->msg->notificationText()), _pinnedBar->msg->inReplyText(),
Ui::DialogTextOptions()); Ui::DialogTextOptions());
update(); update();
} else if (force) { } else if (force) {
@ -6788,8 +6788,10 @@ void HistoryWidget::drawPinnedBar(Painter &p) {
p.setFont(st::msgServiceNameFont); p.setFont(st::msgServiceNameFont);
p.drawText(left, top + st::msgServiceNameFont->ascent, lang(lng_pinned_message)); p.drawText(left, top + st::msgServiceNameFont->ascent, lang(lng_pinned_message));
p.setPen(!_pinnedBar->msg->toHistoryMessage() ? st::historyComposeAreaFgService : st::historyComposeAreaFg); p.setPen(st::historyComposeAreaFg);
p.setTextPalette(st::historyComposeAreaPalette);
_pinnedBar->text.drawElided(p, left, top + st::msgServiceNameFont->height, width() - left - _pinnedBar->cancel->width() - st::msgReplyPadding.right()); _pinnedBar->text.drawElided(p, left, top + st::msgServiceNameFont->height, width() - left - _pinnedBar->cancel->width() - st::msgReplyPadding.right());
p.restoreTextPalette();
} else { } else {
p.setFont(st::msgDateFont); p.setFont(st::msgDateFont);
p.setPen(st::historyComposeAreaFgService); p.setPen(st::historyComposeAreaFgService);