From 2b122087c4c52d21dcf36683f74ac42cbdd7cd93 Mon Sep 17 00:00:00 2001 From: 23rd <23rd@vivaldi.net> Date: Sat, 30 Nov 2024 09:14:08 +0300 Subject: [PATCH] Re-fixed focus capture from compose search widget. --- .../history/view/controls/history_view_compose_search.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_search.cpp b/Telegram/SourceFiles/history/view/controls/history_view_compose_search.cpp index 9e98ae7c7..19bf4bb95 100644 --- a/Telegram/SourceFiles/history/view/controls/history_view_compose_search.cpp +++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_search.cpp @@ -390,7 +390,7 @@ rpl::producer> TopBar::keyEvents() const { } void TopBar::setInnerFocus() { - if (Ui::InFocusChain(_select)) { + if (Ui::AppInFocus() && Ui::InFocusChain(_select->window())) { _select->setInnerFocus(); } } @@ -1035,7 +1035,7 @@ ComposeSearch::Inner::Inner( } void ComposeSearch::Inner::setInnerFocus() { - if (Ui::InFocusChain(_topBar)) { + if (Ui::AppInFocus() && Ui::InFocusChain(_topBar->window())) { _topBar->setInnerFocus(); } }