From 59522184879b14fbceb6fd7fe48c5d30fe256771 Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Thu, 12 Dec 2024 15:55:26 +0100 Subject: [PATCH] Move popup position to avoid overlapping with popup button. --- Linphone/view/Control/Button/PopupButton.qml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Linphone/view/Control/Button/PopupButton.qml b/Linphone/view/Control/Button/PopupButton.qml index 1c1d4f0c5..90c5939a4 100644 --- a/Linphone/view/Control/Button/PopupButton.qml +++ b/Linphone/view/Control/Button/PopupButton.qml @@ -77,9 +77,13 @@ Button { var popupHeight = popup.height + popup.padding var popupWidth = popup.width + popup.padding var winPosition = mainItem.Window.contentItem ? mainItem.Window.contentItem.mapToItem(mainItem,0 , 0) : {x:0,y:0} - +// Stay inside main window y = Math.max( Math.min( winPosition.y + mainItem.Window.height - popupHeight, mainItem.height), winPosition.y) x = Math.max( Math.min( winPosition.x + mainItem.Window.width - popupWidth, 0), winPosition.x) +// Avoid overlapping with popup button by going to the right (todo: check if left is better?) + if( y < mainItem.height && y + popupHeight > 0){ + x += mainItem.width + } popup.contentItem.forceActiveFocus() } onHeightChanged: Qt.callLater(updatePosition)