From b5c3751c7208d68c2dfafc6793cf52d1cf3a563a Mon Sep 17 00:00:00 2001
From: Gaelle Braud <gaelle.braud@belledonne-communications.com>
Date: Wed, 20 Nov 2024 12:36:18 +0100
Subject: [PATCH] fix layout polish loop (this one may be the right one)

---
 Linphone/core/conference/ConferenceInfoList.cpp      |  2 +-
 .../view/Control/Display/Meeting/MeetingListView.qml | 12 +++++++-----
 Linphone/view/Page/Main/Meeting/MeetingPage.qml      |  5 +++--
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/Linphone/core/conference/ConferenceInfoList.cpp b/Linphone/core/conference/ConferenceInfoList.cpp
index 7fe5e41ac..5abb5c34a 100644
--- a/Linphone/core/conference/ConferenceInfoList.cpp
+++ b/Linphone/core/conference/ConferenceInfoList.cpp
@@ -66,7 +66,7 @@ void ConferenceInfoList::setSelf(QSharedPointer<ConferenceInfoList> me) {
 				// Cancelled conference organized ourself me must be hidden
 				if (conferenceInfo->getState() == linphone::ConferenceInfo::State::Cancelled) {
 					auto myAddress = defaultAccount->getContactAddress();
-					if (myAddress && myAddress->weakEqual(conferenceInfo->getOrganizer())) continue;
+					if (!myAddress || myAddress->weakEqual(conferenceInfo->getOrganizer())) continue;
 				}
 				if (confInfoCore) {
 					qDebug() << log().arg("Add conf") << confInfoCore->getSubject() << "with state"
diff --git a/Linphone/view/Control/Display/Meeting/MeetingListView.qml b/Linphone/view/Control/Display/Meeting/MeetingListView.qml
index e2c84a2eb..0b18dad69 100644
--- a/Linphone/view/Control/Display/Meeting/MeetingListView.qml
+++ b/Linphone/view/Control/Display/Meeting/MeetingListView.qml
@@ -34,7 +34,7 @@ ListView {
 		delayMove.restart()	// Move to exact position after load.
 	}
 	onAtYEndChanged: if(atYEnd) confInfoProxy.displayMore()
-	
+
 	Timer{
 		id: delayMove
 		interval: 60
@@ -68,7 +68,7 @@ ListView {
 
 	delegate: FocusScope {
 		id: itemDelegate
-		height: 63 * DefaultStyle.dp + topOffset
+		height: 63 * DefaultStyle.dp
 		width: mainItem.width
 		enabled: !isCanceled && haveModel
 		property var previousItem : mainItem.model.count > 0 && index > 0 ? mainItem.model.getAt(index-1) : null
@@ -79,14 +79,16 @@ ListView {
 		property bool isFirst : ListView.previousSection !== ListView.section
 		property int topOffset: (dateDay.visible && !isFirst? 8 * DefaultStyle.dp : 0)
 		property var endDateTime: $modelData ? $modelData.core.endDateTime : UtilsCpp.getCurrentDateTime()
-
 		property var haveModel: !!$modelData && $modelData != undefined && $modelData.core.haveModel || false
 		property bool isCanceled: $modelData.core.state === LinphoneEnums.ConferenceInfoState.Cancelled
-		
+		Component.onCompleted: if (!isFirst && dateDay.visible) {
+			height = (63+topOffset)*DefaultStyle.dp
+			delegateIn.anchors.topMargin = topOffset
+		}
 		
 		RowLayout{
+			id: delegateIn
 			anchors.fill: parent
-			anchors.topMargin:parent.topOffset
 			spacing: 0
 			Item{
 				Layout.preferredWidth: 32 * DefaultStyle.dp
diff --git a/Linphone/view/Page/Main/Meeting/MeetingPage.qml b/Linphone/view/Page/Main/Meeting/MeetingPage.qml
index be3c1e866..ec7125fef 100644
--- a/Linphone/view/Page/Main/Meeting/MeetingPage.qml
+++ b/Linphone/view/Page/Main/Meeting/MeetingPage.qml
@@ -98,10 +98,11 @@ AbstractMainPage {
 
 	leftPanelContent: Control.StackView {
 		id: leftPanelStackView
-		Layout.fillHeight: true
 		Layout.fillWidth: true
+		Layout.fillHeight: true
 		Layout.leftMargin: 45 * DefaultStyle.dp
 		initialItem: listLayout
+		clip: true
 	}
 
 	Item {
@@ -129,7 +130,7 @@ AbstractMainPage {
 			
 			ColumnLayout {
 				anchors.fill: parent
-				spacing: 0
+				spacing: 0 
 				RowLayout {
 					Layout.rightMargin: 38 * DefaultStyle.dp
 					spacing: 0