Commit 57bf995e authored by armin's avatar armin

Merge branch 'master' into channelRowGreyFix

parents 48713a2c 3955f4f0
Pipeline #787 passed with stage
in 4 minutes and 11 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