diff --git a/linphone-app/ui/modules/Linphone/Chat/ChatMenu.qml b/linphone-app/ui/modules/Linphone/Chat/ChatMenu.qml index 895ca0010..2a172bbe8 100644 --- a/linphone-app/ui/modules/Linphone/Chat/ChatMenu.qml +++ b/linphone-app/ui/modules/Linphone/Chat/ChatMenu.qml @@ -27,7 +27,7 @@ Item { signal removeEntryRequested() function open(){ - messageMenu.open() + messageMenu.popup() } @@ -92,7 +92,7 @@ Item { ? Qt.PointingHandCursor : Qt.IBeamCursor - onClicked: mouse.button === Qt.RightButton && messageMenu.open() + onClicked: mouse.button === Qt.RightButton && messageMenu.popup() } } diff --git a/linphone-app/ui/modules/Linphone/Timeline/Timeline.qml b/linphone-app/ui/modules/Linphone/Timeline/Timeline.qml index 9ad4f1ce8..f1161b46c 100644 --- a/linphone-app/ui/modules/Linphone/Timeline/Timeline.qml +++ b/linphone-app/ui/modules/Linphone/Timeline/Timeline.qml @@ -53,7 +53,7 @@ Rectangle { Layout.preferredHeight: TimelineStyle.legend.height Layout.alignment: Qt.AlignTop color: showHistory.containsMouse?TimelineStyle.legend.backgroundColor.hovered:TimelineStyle.legend.backgroundColor.normal - visible:view.count > 0 + visible:view.count > 0 || searchView.visible MouseArea{// no more showing history id:showHistory @@ -185,7 +185,12 @@ Rectangle { border.width: 2 visible:false //color: ContactsStyle.bar.backgroundColor - onVisibleChanged: timeline.model.filterText = (visible?searchBar.text : '') + onVisibleChanged: if(visible){ + timeline.model.filterText = searchBar.text + searchBar.forceActiveFocus() + }else{ + timeline.model.filterText = '' + } TextField { id:searchBar