diff --git a/Linphone/view/Control/Display/Chat/ChatListView.qml b/Linphone/view/Control/Display/Chat/ChatListView.qml index 0aec90885..9dded30a7 100644 --- a/Linphone/view/Control/Display/Chat/ChatListView.qml +++ b/Linphone/view/Control/Display/Chat/ChatListView.qml @@ -37,10 +37,15 @@ ListView { signal markAllAsRead() signal chatClicked(ChatGui chat) + property bool makingResearch: false + signal researchDone() + onResearchDone: makingResearch = false + model: ChatProxy { id: chatProxy filterText: mainItem.searchText onFilterTextChanged: { + mainItem.makingResearch = true chatToSelectLater = currentChatGui } onModelAboutToBeReset: { @@ -58,6 +63,7 @@ ListView { } else { selectChat(mainItem.currentChatGui) } + mainItem.researchDone() } onChatAdded: (chat) => { mainItem.chatToSelect = chat diff --git a/Linphone/view/Page/Main/Chat/ChatPage.qml b/Linphone/view/Page/Main/Chat/ChatPage.qml index e141a6adf..c7e42b66d 100644 --- a/Linphone/view/Page/Main/Chat/ChatPage.qml +++ b/Linphone/view/Page/Main/Chat/ChatPage.qml @@ -227,6 +227,10 @@ AbstractMainPage { searchBar: searchBar Control.ScrollBar.vertical: scrollbar + onResearchDone: { + searchBar.forceActiveFocus() + } + onCurrentChatGuiChanged: { mainItem.selectedChatGui = currentChatGui }