From bb7730eee15bbc9eee68dce786e11bbd8be9f20b Mon Sep 17 00:00:00 2001 From: John Preston Date: Thu, 9 Feb 2017 16:49:43 +0300 Subject: [PATCH] Back mouse button and key return you in stack. Now you can use mouse Back button and Back keyboard button to return from media overview through profile to the chat view. --- Telegram/SourceFiles/mainwidget.cpp | 5 +++++ Telegram/SourceFiles/profile/profile_inner_widget.cpp | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp index 7a23b2b21..990e64492 100644 --- a/Telegram/SourceFiles/mainwidget.cpp +++ b/Telegram/SourceFiles/mainwidget.cpp @@ -3067,6 +3067,11 @@ bool MainWidget::eventFilter(QObject *o, QEvent *e) { Global::RefDialogsListFocused().set(true, false); } } + } else if (e->type() == QEvent::MouseButtonPress) { + if (static_cast(e)->button() == Qt::BackButton) { + showBackFromStack(); + return true; + } } return TWidget::eventFilter(o, e); } diff --git a/Telegram/SourceFiles/profile/profile_inner_widget.cpp b/Telegram/SourceFiles/profile/profile_inner_widget.cpp index d91b3f2f2..04c4f9e03 100644 --- a/Telegram/SourceFiles/profile/profile_inner_widget.cpp +++ b/Telegram/SourceFiles/profile/profile_inner_widget.cpp @@ -130,7 +130,7 @@ void InnerWidget::paintEvent(QPaintEvent *e) { } void InnerWidget::keyPressEvent(QKeyEvent *e) { - if (e->key() == Qt::Key_Escape) { + if (e->key() == Qt::Key_Escape || e->key() == Qt::Key_Back) { emit cancelled(); } }