From 352fc55234db96e98031fbcaf4530afb22d804d3 Mon Sep 17 00:00:00 2001 From: John Preston Date: Thu, 27 Sep 2018 17:28:57 +0300 Subject: [PATCH] Move back by Back key in Intro / Info / Settings. --- Telegram/SourceFiles/info/info_wrap_widget.cpp | 2 +- Telegram/SourceFiles/intro/introwidget.cpp | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Telegram/SourceFiles/info/info_wrap_widget.cpp b/Telegram/SourceFiles/info/info_wrap_widget.cpp index 16b425bf2c..a87215a01f 100644 --- a/Telegram/SourceFiles/info/info_wrap_widget.cpp +++ b/Telegram/SourceFiles/info/info_wrap_widget.cpp @@ -971,7 +971,7 @@ void WrapWidget::resizeEvent(QResizeEvent *e) { } void WrapWidget::keyPressEvent(QKeyEvent *e) { - if (e->key() == Qt::Key_Escape) { + if (e->key() == Qt::Key_Escape || e->key() == Qt::Key_Back) { if (hasStackHistory() || wrap() != Wrap::Layer) { checkBeforeClose([=] { _controller->showBackFromStack(); }); return; diff --git a/Telegram/SourceFiles/intro/introwidget.cpp b/Telegram/SourceFiles/intro/introwidget.cpp index 65c296d018..6ba5520ecb 100644 --- a/Telegram/SourceFiles/intro/introwidget.cpp +++ b/Telegram/SourceFiles/intro/introwidget.cpp @@ -573,11 +573,13 @@ void Widget::updateControlsGeometry() { void Widget::keyPressEvent(QKeyEvent *e) { if (_a_show.animating() || getStep()->animating()) return; - if (e->key() == Qt::Key_Escape) { + if (e->key() == Qt::Key_Escape || e->key() == Qt::Key_Back) { if (getStep()->hasBack()) { historyMove(Direction::Back); } - } else if (e->key() == Qt::Key_Enter || e->key() == Qt::Key_Return || e->key() == Qt::Key_Space) { + } else if (e->key() == Qt::Key_Enter + || e->key() == Qt::Key_Return + || e->key() == Qt::Key_Space) { getStep()->submit(); } }