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

Try cancelling the new search by mouse back button.

Browse source
This commit is contained in:
John Preston 2024-04-24 17:41:12 +04:00
parent 72d5a9b3e0
commit d5a347ede7
3 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1107,6 +1107,13 @@ void Widget::updateHasFocus(not_null<QWidget*> focused) {
} }
} }
bool Widget::cancelSearchByMouseBack() {
return _searchHasFocus
&& !_searchSuggestionsLocked
&& !_searchInChat
&& cancelSearch();
}
void Widget::processSearchFocusChange() { void Widget::processSearchFocusChange() {
_searchSuggestionsLocked = _suggestions && _suggestions->persist(); _searchSuggestionsLocked = _suggestions && _suggestions->persist();
updateCancelSearch(); updateCancelSearch();

1
Telegram/SourceFiles/dialogs/dialogs_widget.h
View file

@ -133,6 +133,7 @@ public:
QRect floatPlayerAvailableRect() override; QRect floatPlayerAvailableRect() override;
bool cancelSearch(); bool cancelSearch();
bool cancelSearchByMouseBack();
~Widget(); ~Widget();

3
Telegram/SourceFiles/mainwidget.cpp
View file

@ -2649,7 +2649,8 @@ bool MainWidget::eventFilter(QObject *o, QEvent *e) {
if (widget && (widget->window() == window())) { if (widget && (widget->window() == window())) {
const auto event = static_cast<QMouseEvent*>(e); const auto event = static_cast<QMouseEvent*>(e);
if (event->button() == Qt::BackButton) { if (event->button() == Qt::BackButton) {
if (!Core::App().hideMediaView()) { if (!Core::App().hideMediaView()
&& (!_dialogs || !_dialogs->cancelSearchByMouseBack())) {
handleHistoryBack(); handleHistoryBack();
} }
return true; return true;