From ddd57517df6c01150bf54e36aa9dfb749fb90ea8 Mon Sep 17 00:00:00 2001 From: John Preston Date: Mon, 27 Nov 2017 19:09:26 +0400 Subject: [PATCH] Fix text overflow in history top bar. --- .../history/history_top_bar_widget.cpp | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/Telegram/SourceFiles/history/history_top_bar_widget.cpp b/Telegram/SourceFiles/history/history_top_bar_widget.cpp index eed6a2a88..0e3e30b10 100644 --- a/Telegram/SourceFiles/history/history_top_bar_widget.cpp +++ b/Telegram/SourceFiles/history/history_top_bar_widget.cpp @@ -303,8 +303,19 @@ void HistoryTopBarWidget::paintTopBar(Painter &p, TimeMs ms) { auto namewidth = width() - _rightTaken - nameleft; p.setFont(st::dialogsTextFont); if (!history->paintSendAction(p, nameleft, statustop, namewidth, width(), st::historyStatusFgTyping, ms)) { - p.setPen(_titlePeerTextOnline ? st::historyStatusFgActive : st::historyStatusFg); - p.drawText(nameleft, statustop + st::dialogsTextFont->ascent, _titlePeerText); + auto statustext = _titlePeerText; + auto statuswidth = _titlePeerTextWidth; + if (statuswidth > namewidth) { + statustext = st::dialogsTextFont->elided( + statustext, + namewidth, + Qt::ElideLeft); + statuswidth = st::dialogsTextFont->width(statustext); + } + p.setPen(_titlePeerTextOnline + ? st::historyStatusFgActive + : st::historyStatusFg); + p.drawTextLeft(nameleft, statustop, width(), statustext, statuswidth); } p.setPen(st::dialogsNameFg);