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

Fix forum search open by Ctrl+F.

Browse source
This commit is contained in:
John Preston 2024-05-20 10:51:14 +04:00
parent 6a8edefc87
commit 583bcca6a9
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Telegram/SourceFiles/dialogs/dialogs_widget.cpp
View file

@ -1599,8 +1599,7 @@ void Widget::checkUpdateStatus() {
void Widget::setInnerFocus(bool unfocusSearch) { void Widget::setInnerFocus(bool unfocusSearch) {
if (_childList) { if (_childList) {
_childList->setInnerFocus(); _childList->setInnerFocus();
} else if ((_openedFolder || _openedForum) } else if (_subsectionTopBar && _subsectionTopBar->searchSetFocus()) {
&& _subsectionTopBar->searchSetFocus()) {
return; return;
} else if (!unfocusSearch } else if (!unfocusSearch
&& (!_search->getLastText().isEmpty() && (!_search->getLastText().isEmpty()
@ -2967,10 +2966,10 @@ bool Widget::applySearchState(SearchState state) {
&& _lastSearchText == HistoryView::SwitchToChooseFromQuery()) { && _lastSearchText == HistoryView::SwitchToChooseFromQuery()) {
cancelSearch(); cancelSearch();
} }
if (_searchState.inChat || !_searchState.query.isEmpty()) { if (!_searchState.inChat && _searchState.query.isEmpty()) {
_search->setFocus();
} else {
setInnerFocus(); setInnerFocus();
} else if (!_subsectionTopBar || !_subsectionTopBar->searchSetFocus()) {
_search->setFocus();
} }
updateForceDisplayWide(); updateForceDisplayWide();
applySearchUpdate(); applySearchUpdate();