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 searching with "from:" prefix.

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

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

@ -2881,6 +2881,12 @@ bool Widget::applySearchState(SearchState state) {
state.inChat = session().data().history(session().user()); state.inChat = session().data().history(session().user());
} }
const auto clearQuery = state.fromPeer
&& (_lastSearchText == HistoryView::SwitchToChooseFromQuery());
if (clearQuery) {
state.query = _lastSearchText = QString();
}
const auto inChatChanged = (_searchState.inChat != state.inChat); const auto inChatChanged = (_searchState.inChat != state.inChat);
const auto fromPeerChanged = (_searchState.fromPeer != state.fromPeer); const auto fromPeerChanged = (_searchState.fromPeer != state.fromPeer);
const auto tagsChanged = (_searchState.tags != state.tags); const auto tagsChanged = (_searchState.tags != state.tags);
@ -2962,10 +2968,6 @@ bool Widget::applySearchState(SearchState state) {
_subsectionTopBar->searchEnableJumpToDate( _subsectionTopBar->searchEnableJumpToDate(
_openedForum && _searchState.inChat); _openedForum && _searchState.inChat);
} }
if (_searchState.fromPeer
&& _lastSearchText == HistoryView::SwitchToChooseFromQuery()) {
cancelSearch();
}
if (!_searchState.inChat && _searchState.query.isEmpty()) { if (!_searchState.inChat && _searchState.query.isEmpty()) {
setInnerFocus(); setInnerFocus();
} else if (!_subsectionTopBar || !_subsectionTopBar->searchSetFocus()) { } else if (!_subsectionTopBar || !_subsectionTopBar->searchSetFocus()) {