From b7319c00b9c74a19926b34a5371249fc3225dd80 Mon Sep 17 00:00:00 2001 From: John Preston Date: Fri, 30 Oct 2020 16:27:53 +0300 Subject: [PATCH] Fix go to original button in Pinned section. --- Telegram/SourceFiles/history/view/history_view_message.cpp | 3 ++- Telegram/SourceFiles/mainwidget.cpp | 2 +- Telegram/lib_ui | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Telegram/SourceFiles/history/view/history_view_message.cpp b/Telegram/SourceFiles/history/view/history_view_message.cpp index 6763776dcd..67f888493e 100644 --- a/Telegram/SourceFiles/history/view/history_view_message.cpp +++ b/Telegram/SourceFiles/history/view/history_view_message.cpp @@ -2203,7 +2203,8 @@ bool Message::displayFastReply() const { } bool Message::displayRightActionComments() const { - return data()->repliesAreComments() + return !isPinnedContext() + && data()->repliesAreComments() && media() && media()->isDisplayed() && !hasBubble(); diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp index 847b82de38..63a1f13e4a 100644 --- a/Telegram/SourceFiles/mainwidget.cpp +++ b/Telegram/SourceFiles/mainwidget.cpp @@ -1423,7 +1423,7 @@ void MainWidget::ui_showPeerHistory( if (const auto activeChat = _controller->activeChatCurrent()) { if (const auto peer = activeChat.peer()) { if (way == Way::Forward && peer->id == peerId) { - way = Way::ClearStack; + way = _mainSection ? Way::Backward : Way::ClearStack; } } } diff --git a/Telegram/lib_ui b/Telegram/lib_ui index 109375453e..54a8c62bf5 160000 --- a/Telegram/lib_ui +++ b/Telegram/lib_ui @@ -1 +1 @@ -Subproject commit 109375453e1465daff0970a920ba65e9fe8c78f0 +Subproject commit 54a8c62bf5dea5e381526a4b25aa5482e140b26c