fix #LINQT-1605 scroll in params for Qt6.5.3

edit gitignore

.gitignore

@@ -51,3 +51,4 @@ linphone.spec
 
 # VSCode
 linphone60*.log
+linphone61*.log

Linphone/view/Control/Button/Settings/SwitchSetting.qml

@@ -12,7 +12,6 @@ RowLayout {
 	property var propertyOwnerGui
 	property bool enabled: true
 	spacing : 20 * DefaultStyle.dp
-	Layout.minimumHeight: 32 * DefaultStyle.dp
 	signal checkedChanged(bool checked)
 
 	function setChecked(value) {
@@ -20,6 +19,8 @@ RowLayout {
 	}
 
 	ColumnLayout {
+		Layout.minimumHeight: 32 * DefaultStyle.dp
+		spacing: 4 * DefaultStyle.dp
 		Text {
 			text: titleText
 			font: Typography.p2l

Linphone/view/Page/Layout/Settings/AbstractSettingsLayout.qml

@@ -16,7 +16,7 @@ Rectangle {
 	property var model
 	color: DefaultStyle.grey_0
 	property var container
-	property int contentHeight: contentRepeater.count > 0 ? contentRepeater.itemAt(0).height * contentRepeater.count : 0
+	// property int contentHeight: contentListView.contentHeight
 	property int minimumWidthForSwitchintToRowLayout: 981 * DefaultStyle.dp
 	property var useVerticalLayout
 	property bool saveButtonVisible: true
@@ -34,12 +34,10 @@ Rectangle {
 	Component.onCompleted: {
 			setResponsivityFlags()
 	}
-	ColumnLayout {
-		spacing: 0
-		anchors.fill: parent
 	Control.Control {
 		id: header
-			Layout.fillWidth: true
+		anchors.left: parent.left
+		anchors.right: parent.right
 		leftPadding: 45 * DefaultStyle.dp
 		rightPadding: 45 * DefaultStyle.dp
 		z: 1
@@ -99,14 +97,19 @@ Rectangle {
 	}
 	Control.ScrollView {
 		id: scrollView
-			Layout.topMargin: 16 * DefaultStyle.dp
-			Layout.fillWidth: true
-			Layout.fillHeight: true
-			leftPadding: 45 * DefaultStyle.dp
-			rightPadding: 45 * DefaultStyle.dp
+		anchors.left: parent.left
+		anchors.right: parent.right
+		anchors.bottom: parent.bottom
+		anchors.top: header.bottom
+		anchors.topMargin: 16 * DefaultStyle.dp
+		// Workaround while the CI is made with Qt6.5.3
+		// When updated to 6.8, remove this Item and
+		// change the ScrollView with a Flickable
+		Item{anchors.fill: parent}
+		contentHeight: contentListView.contentHeight
 		Control.ScrollBar.vertical: ScrollBar {
-				active: scrollViewContent.implicitHeight > scrollView.height
-				visible: scrollViewContent.implicitHeight > scrollView.height
+			active: contentListView.contentHeight > scrollView.height
+			visible: contentListView.contentHeight > scrollView.height
 			interactive: true
 			policy: Control.ScrollBar.AsNeeded
 			anchors.top: parent.top
@@ -117,14 +120,18 @@ Rectangle {
 		Control.ScrollBar.horizontal: ScrollBar {
 			active: false
 		}
-			ColumnLayout {
-				id: scrollViewContent
-				width: scrollView.width - scrollView.leftPadding - scrollView.rightPadding
-				spacing: 10 * DefaultStyle.dp
-				Repeater {
-					id: contentRepeater
+		ListView {
+			id: contentListView
 			model: mainItem.contentModel
+			anchors.left: parent.left
+			anchors.right: parent.right
+			anchors.leftMargin: 45 * DefaultStyle.dp
+			anchors.rightMargin: 45 * DefaultStyle.dp
+			height: contentHeight
+			spacing: 10 * DefaultStyle.dp
 			delegate: ColumnLayout {
+				spacing: 16 * DefaultStyle.dp
+				width: contentListView.width
 				Rectangle {
 					visible: index !== 0
 					Layout.topMargin: (modelData.hideTopSeparator ? 0 : 16) * DefaultStyle.dp
@@ -137,7 +144,7 @@ Rectangle {
 					rows: 1
 					columns: mainItem.useVerticalLayout ? 1 : 2
 					Layout.fillWidth: true
-							Layout.preferredWidth: parent.width
+					// Layout.preferredWidth: parent.width
 					rowSpacing: (modelData.title.length > 0 || modelData.subTitle.length > 0 ? 20 : 0) * DefaultStyle.dp
 					columnSpacing: 47 * DefaultStyle.dp
 					ColumnLayout {
@@ -171,6 +178,7 @@ Rectangle {
 						Layout.preferredWidth: (modelData.customWidth > 0 ? modelData.customWidth : 545) * DefaultStyle.dp
 						Layout.alignment: Qt.AlignRight
 						Loader {
+							id: contentLoader
 							Layout.fillWidth: true
 							sourceComponent: modelData.contentComponent
 						}
@@ -183,6 +191,4 @@ Rectangle {
 		}
 	}
 }
-	}
-}