Commit 3955f4f0 authored by armin's avatar armin

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

Resolve "Cannot choose between messages and chats in the search field"

Closes #171

See merge request !214
parents ca118924 a3e2b467
Pipeline #786 passed with stage
in 2 minutes and 13 seconds
...@@ -305,6 +305,7 @@ Item { ...@@ -305,6 +305,7 @@ Item {
prevText = text prevText = text
hideSearchField() hideSearchField()
messageSearchModel.clear() messageSearchModel.clear()
roomSearchModel.clear()
focus = false focus = false
} }
...@@ -359,9 +360,9 @@ Item { ...@@ -359,9 +360,9 @@ Item {
onActiveFocusChanged: { onActiveFocusChanged: {
if(activeFocus){ if(activeFocus){
showSearchField() showSearchField()
}else if(text == ""){ }/*else if(text == ""){
resetSearchField() resetSearchField()
} }*/
} }
onAccepted: { 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