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

fixed pinned message display if input field is hidden, fixed pinned message remove, removed copy post link context menu item from public supergroup messages

This commit is contained in:
John Preston 2016-03-13 16:21:26 +03:00
parent 4c13377d1e
commit 6792f9c77b
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Telegram/SourceFiles/history.h
View File

@ -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();

7
Telegram/SourceFiles/historywidget.cpp
View File

@ -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);