From ed965d3ecb838c5d78873788bf6dd1ba3fb1e778 Mon Sep 17 00:00:00 2001
From: Julien Wadel <julien.wadel@belledonne-communications.com>
Date: Tue, 23 Aug 2022 14:30:06 +0200
Subject: [PATCH] Fix calls list header layout (cross icon moved on action
 buttons)

---
 .../ui/views/App/Calls/CallsWindow.qml        | 72 ++++++++++---------
 1 file changed, 37 insertions(+), 35 deletions(-)

diff --git a/linphone-app/ui/views/App/Calls/CallsWindow.qml b/linphone-app/ui/views/App/Calls/CallsWindow.qml
index 9ac192480..a7c3f0e3b 100644
--- a/linphone-app/ui/views/App/Calls/CallsWindow.qml
+++ b/linphone-app/ui/views/App/Calls/CallsWindow.qml
@@ -119,46 +119,48 @@ Window {
 							GradientStop { position: 1.0; color: CallsWindowStyle.callsList.header.color2 }
 						}
 					}
-					
-					ActionBar {
-						anchors {
-							left: parent.left
-							leftMargin: CallsWindowStyle.callsList.header.leftMargin
-							verticalCenter: parent.verticalCenter
-						}
-						
-						iconSize: CallsWindowStyle.callsList.header.iconSize
-						
-						ActionButton {
-							isCustom: true
-							backgroundRadius: 4
-							colorSet: CallsWindowStyle.callsList.newCall
-							visible: SettingsModel.outgoingCallsEnabled
+					RowLayout{
+						anchors.fill: parent
+						ActionBar {
+							Layout.leftMargin: CallsWindowStyle.callsList.header.leftMargin
+							Layout.alignment: Qt.AlignVCenter
 							
-							onClicked: Logic.openCallSipAddress()
-						}
-						
-						ActionButton {
-							isCustom: true
-							backgroundRadius: 4
-							colorSet: CallsWindowStyle.callsList.newConference
-							visible: SettingsModel.conferenceEnabled
+							iconSize: CallsWindowStyle.callsList.header.iconSize
 							
-							onClicked: {
-								Logic.openConferenceManager()
+							ActionButton {
+								isCustom: true
+								backgroundRadius: 4
+								colorSet: CallsWindowStyle.callsList.newCall
+								visible: SettingsModel.outgoingCallsEnabled
+								
+								onClicked: Logic.openCallSipAddress()
+							}
+							
+							ActionButton {
+								isCustom: true
+								backgroundRadius: 4
+								colorSet: CallsWindowStyle.callsList.newConference
+								visible: SettingsModel.conferenceEnabled
+								
+								onClicked: {
+									Logic.openConferenceManager()
+								}
 							}
 						}
+						Item{// Spacer
+							Layout.fillWidth: true
+						}
+						ActionButton {
+							Layout.alignment: Qt.AlignVCenter
+							Layout.rightMargin: 15
+							isCustom: true
+							backgroundRadius: 4
+							colorSet: CallsWindowStyle.callsList.closeButton
+							
+							onClicked: mainPaned.close()
+						}
 					}
-					ActionButton {
-						anchors.right: parent.right
-						anchors.rightMargin: 15
-						anchors.verticalCenter: parent.verticalCenter
-						isCustom: true
-						backgroundRadius: 4
-						colorSet: CallsWindowStyle.callsList.closeButton
-						
-						onClicked: mainPaned.close()
-					}
+					
 				}
 				
 				Calls {