void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-05 06:33:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Better folder / chat closing by escape.

Browse source
This commit is contained in:
John Preston 2022-11-08 21:20:25 +04:00
parent 4a8b5c3015
commit 66435d5269
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Telegram/SourceFiles/mainwidget.cpp
View file

@ -2653,12 +2653,16 @@ void MainWidget::handleHistoryBack() {
if (!_dialogs) { if (!_dialogs) {
return; return;
} }
const auto historyFromFolder = _history->history()
? _history->history()->folder()
: nullptr;
const auto openedFolder = _controller->openedFolder().current(); const auto openedFolder = _controller->openedFolder().current();
const auto rootPeer = _stack.empty()
? _history->peer()
: _stack.front()->peer();
const auto rootHistory = rootPeer
? rootPeer->owner().historyLoaded(rootPeer)
: nullptr;
const auto rootFolder = rootHistory ? rootHistory->folder() : nullptr;
if (!openedFolder if (!openedFolder
|| historyFromFolder == openedFolder || rootFolder == openedFolder
|| _dialogs->isHidden()) { || _dialogs->isHidden()) {
_controller->showBackFromStack(); _controller->showBackFromStack();
_dialogs->setInnerFocus(); _dialogs->setInnerFocus();