From 6792f9c77b6cbb7ca429c7d3eebdcf657e30b021 Mon Sep 17 00:00:00 2001 From: John Preston Date: Sun, 13 Mar 2016 16:21:26 +0300 Subject: [PATCH] fixed pinned message display if input field is hidden, fixed pinned message remove, removed copy post link context menu item from public supergroup messages --- Telegram/SourceFiles/history.h | 2 +- Telegram/SourceFiles/historywidget.cpp | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Telegram/SourceFiles/history.h b/Telegram/SourceFiles/history.h index 3cbcf5ccd..abc72437f 100644 --- a/Telegram/SourceFiles/history.h +++ b/Telegram/SourceFiles/history.h @@ -1097,7 +1097,7 @@ public: bool canEdit(const QDateTime &cur) const; bool hasDirectLink() const { - return id > 0 && _history->peer->isChannel() && _history->peer->asChannel()->isPublic(); + return id > 0 && _history->peer->isChannel() && _history->peer->asChannel()->isPublic() && !_history->peer->isMegagroup(); } QString directLink() const { return hasDirectLink() ? qsl("https://telegram.me/") + _history->peer->asChannel()->username + '/' + QString::number(id) : QString(); diff --git a/Telegram/SourceFiles/historywidget.cpp b/Telegram/SourceFiles/historywidget.cpp index 4a8a352e7..4d5dc0db9 100644 --- a/Telegram/SourceFiles/historywidget.cpp +++ b/Telegram/SourceFiles/historywidget.cpp @@ -6876,6 +6876,7 @@ bool HistoryWidget::pinnedMsgVisibilityUpdated() { _pinnedBar = nullptr; result = true; _scroll.scrollToY(_scroll.scrollTop() - st::replyHeight); + resizeEvent(0); } return result; } @@ -7889,9 +7890,9 @@ void HistoryWidget::paintEvent(QPaintEvent *e) { drawRecordButton(p); if (_recording) drawRecording(p); } - if (_pinnedBar) { - drawPinnedBar(p); - } + } + if (_pinnedBar && !_pinnedBar->cancel.isHidden()) { + drawPinnedBar(p); } if (_scroll.isHidden()) { QPoint dogPos((width() - st::msgDogImg.pxWidth()) / 2, ((height() - _field.height() - 2 * st::sendPadding - st::msgDogImg.pxHeight()) * 4) / 9);