Commit a3e2b467 authored by armin's avatar armin

Merge branch 'fix' into 171-cannot-choose-between-messages-and-chats-in-the-search-field

parents ca118924 78ded239
Pipeline #785 passed with stage
in 3 minutes and 45 seconds
......@@ -305,6 +305,7 @@ Item {
prevText = text
hideSearchField()
messageSearchModel.clear()
roomSearchModel.clear()
focus = false
}
......@@ -359,9 +360,9 @@ Item {
onActiveFocusChanged: {
if(activeFocus){
showSearchField()
}else if(text == ""){
}/*else if(text == ""){
resetSearchField()
}
}*/
}
onAccepted: {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment