mirror of
https://gitlab.linphone.org/BC/public/linphone-desktop.git
synced 2026-01-17 03:18:07 +00:00
fix #LINQT-1605 scroll in params for Qt6.5.3
edit gitignore
This commit is contained in:
Gaelle Braud
parent
e6fe32cfee
commit
743a909bb1
3 changed files with 150 additions and 142 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -51,3 +51,4 @@ linphone.spec
|
|||
|
||||
# VSCode
|
||||
linphone60*.log
|
||||
linphone61*.log
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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,150 +34,156 @@ Rectangle {
|
|||
Component.onCompleted: {
|
||||
setResponsivityFlags()
|
||||
}
|
||||
ColumnLayout {
|
||||
spacing: 0
|
||||
anchors.fill: parent
|
||||
Control.Control {
|
||||
id: header
|
||||
Layout.fillWidth: true
|
||||
leftPadding: 45 * DefaultStyle.dp
|
||||
rightPadding: 45 * DefaultStyle.dp
|
||||
z: 1
|
||||
background: Rectangle {
|
||||
anchors.fill: parent
|
||||
color: DefaultStyle.grey_0
|
||||
Control.Control {
|
||||
id: header
|
||||
anchors.left: parent.left
|
||||
anchors.right: parent.right
|
||||
leftPadding: 45 * DefaultStyle.dp
|
||||
rightPadding: 45 * DefaultStyle.dp
|
||||
z: 1
|
||||
background: Rectangle {
|
||||
anchors.fill: parent
|
||||
color: DefaultStyle.grey_0
|
||||
}
|
||||
contentItem: ColumnLayout {
|
||||
RowLayout {
|
||||
Layout.fillWidth: true
|
||||
Layout.topMargin: 20 * DefaultStyle.dp
|
||||
spacing: 5 * DefaultStyle.dp
|
||||
Layout.bottomMargin: 10 * DefaultStyle.dp
|
||||
Button {
|
||||
id: backButton
|
||||
Layout.preferredHeight: 24 * DefaultStyle.dp
|
||||
Layout.preferredWidth: 24 * DefaultStyle.dp
|
||||
icon.source: AppIcons.leftArrow
|
||||
focus: true
|
||||
visible: mainItem.container.depth > 1
|
||||
Layout.rightMargin: 41 * DefaultStyle.dp
|
||||
style: ButtonStyle.noBackground
|
||||
onClicked: {
|
||||
mainItem.container.pop()
|
||||
}
|
||||
}
|
||||
Text {
|
||||
text: titleText
|
||||
color: DefaultStyle.main2_600
|
||||
font: Typography.h3
|
||||
}
|
||||
Item {
|
||||
Layout.fillWidth: true
|
||||
}
|
||||
Loader {
|
||||
Layout.alignment: Qt.AlignRight
|
||||
sourceComponent: mainItem.topbarOptionalComponent
|
||||
Layout.rightMargin: 34 * DefaultStyle.dp
|
||||
}
|
||||
MediumButton {
|
||||
id: saveButton
|
||||
style: ButtonStyle.main
|
||||
text: qsTr("Enregistrer")
|
||||
Layout.rightMargin: 6 * DefaultStyle.dp
|
||||
visible: mainItem.saveButtonVisible
|
||||
onClicked: {
|
||||
mainItem.save()
|
||||
}
|
||||
}
|
||||
}
|
||||
contentItem: ColumnLayout {
|
||||
RowLayout {
|
||||
Layout.fillWidth: true
|
||||
Layout.topMargin: 20 * DefaultStyle.dp
|
||||
spacing: 5 * DefaultStyle.dp
|
||||
Layout.bottomMargin: 10 * DefaultStyle.dp
|
||||
Button {
|
||||
id: backButton
|
||||
Layout.preferredHeight: 24 * DefaultStyle.dp
|
||||
Layout.preferredWidth: 24 * DefaultStyle.dp
|
||||
icon.source: AppIcons.leftArrow
|
||||
focus: true
|
||||
visible: mainItem.container.depth > 1
|
||||
Layout.rightMargin: 41 * DefaultStyle.dp
|
||||
style: ButtonStyle.noBackground
|
||||
onClicked: {
|
||||
mainItem.container.pop()
|
||||
}
|
||||
}
|
||||
Text {
|
||||
text: titleText
|
||||
color: DefaultStyle.main2_600
|
||||
font: Typography.h3
|
||||
}
|
||||
Item {
|
||||
Layout.fillWidth: true
|
||||
}
|
||||
Loader {
|
||||
Layout.alignment: Qt.AlignRight
|
||||
sourceComponent: mainItem.topbarOptionalComponent
|
||||
Layout.rightMargin: 34 * DefaultStyle.dp
|
||||
}
|
||||
MediumButton {
|
||||
id: saveButton
|
||||
style: ButtonStyle.main
|
||||
text: qsTr("Enregistrer")
|
||||
Layout.rightMargin: 6 * DefaultStyle.dp
|
||||
visible: mainItem.saveButtonVisible
|
||||
onClicked: {
|
||||
mainItem.save()
|
||||
}
|
||||
}
|
||||
}
|
||||
Rectangle {
|
||||
Layout.fillWidth: true
|
||||
height: 1 * DefaultStyle.dp
|
||||
color: DefaultStyle.main2_500main
|
||||
}
|
||||
Rectangle {
|
||||
Layout.fillWidth: true
|
||||
height: 1 * DefaultStyle.dp
|
||||
color: DefaultStyle.main2_500main
|
||||
}
|
||||
}
|
||||
Control.ScrollView {
|
||||
id: scrollView
|
||||
Layout.topMargin: 16 * DefaultStyle.dp
|
||||
Layout.fillWidth: true
|
||||
Layout.fillHeight: true
|
||||
leftPadding: 45 * DefaultStyle.dp
|
||||
rightPadding: 45 * DefaultStyle.dp
|
||||
Control.ScrollBar.vertical: ScrollBar {
|
||||
active: scrollViewContent.implicitHeight > scrollView.height
|
||||
visible: scrollViewContent.implicitHeight > scrollView.height
|
||||
interactive: true
|
||||
policy: Control.ScrollBar.AsNeeded
|
||||
anchors.top: parent.top
|
||||
anchors.bottom: parent.bottom
|
||||
anchors.right: parent.right
|
||||
anchors.rightMargin: 15 * DefaultStyle.dp
|
||||
}
|
||||
Control.ScrollBar.horizontal: ScrollBar {
|
||||
active: false
|
||||
}
|
||||
ColumnLayout {
|
||||
id: scrollViewContent
|
||||
width: scrollView.width - scrollView.leftPadding - scrollView.rightPadding
|
||||
spacing: 10 * DefaultStyle.dp
|
||||
Repeater {
|
||||
id: contentRepeater
|
||||
model: mainItem.contentModel
|
||||
delegate: ColumnLayout {
|
||||
Rectangle {
|
||||
visible: index !== 0
|
||||
Layout.topMargin: (modelData.hideTopSeparator ? 0 : 16) * DefaultStyle.dp
|
||||
Layout.bottomMargin: 16 * DefaultStyle.dp
|
||||
Layout.fillWidth: true
|
||||
height: 1 * DefaultStyle.dp
|
||||
color: modelData.hideTopSeparator ? 'transparent' : DefaultStyle.main2_500main
|
||||
}
|
||||
GridLayout {
|
||||
rows: 1
|
||||
columns: mainItem.useVerticalLayout ? 1 : 2
|
||||
Layout.fillWidth: true
|
||||
}
|
||||
Control.ScrollView {
|
||||
id: scrollView
|
||||
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: contentListView.contentHeight > scrollView.height
|
||||
visible: contentListView.contentHeight > scrollView.height
|
||||
interactive: true
|
||||
policy: Control.ScrollBar.AsNeeded
|
||||
anchors.top: parent.top
|
||||
anchors.bottom: parent.bottom
|
||||
anchors.right: parent.right
|
||||
anchors.rightMargin: 15 * DefaultStyle.dp
|
||||
}
|
||||
Control.ScrollBar.horizontal: ScrollBar {
|
||||
active: false
|
||||
}
|
||||
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
|
||||
Layout.bottomMargin: 16 * DefaultStyle.dp
|
||||
Layout.fillWidth: true
|
||||
height: 1 * DefaultStyle.dp
|
||||
color: modelData.hideTopSeparator ? 'transparent' : DefaultStyle.main2_500main
|
||||
}
|
||||
GridLayout {
|
||||
rows: 1
|
||||
columns: mainItem.useVerticalLayout ? 1 : 2
|
||||
Layout.fillWidth: true
|
||||
// Layout.preferredWidth: parent.width
|
||||
rowSpacing: (modelData.title.length > 0 || modelData.subTitle.length > 0 ? 20 : 0) * DefaultStyle.dp
|
||||
columnSpacing: 47 * DefaultStyle.dp
|
||||
ColumnLayout {
|
||||
Layout.preferredWidth: 341 * DefaultStyle.dp
|
||||
Layout.maximumWidth: 341 * DefaultStyle.dp
|
||||
spacing: 3 * DefaultStyle.dp
|
||||
Text {
|
||||
text: modelData.title
|
||||
visible: modelData.title.length > 0
|
||||
font: Typography.h4
|
||||
wrapMode: Text.WordWrap
|
||||
color: DefaultStyle.main2_600
|
||||
Layout.preferredWidth: parent.width
|
||||
rowSpacing: (modelData.title.length > 0 || modelData.subTitle.length > 0 ? 20 : 0) * DefaultStyle.dp
|
||||
columnSpacing: 47 * DefaultStyle.dp
|
||||
ColumnLayout {
|
||||
Layout.preferredWidth: 341 * DefaultStyle.dp
|
||||
Layout.maximumWidth: 341 * DefaultStyle.dp
|
||||
spacing: 3 * DefaultStyle.dp
|
||||
Text {
|
||||
text: modelData.title
|
||||
visible: modelData.title.length > 0
|
||||
font: Typography.h4
|
||||
wrapMode: Text.WordWrap
|
||||
color: DefaultStyle.main2_600
|
||||
Layout.preferredWidth: parent.width
|
||||
}
|
||||
Text {
|
||||
text: modelData.subTitle
|
||||
visible: modelData.subTitle.length > 0
|
||||
font: Typography.p1s
|
||||
wrapMode: Text.WordWrap
|
||||
color: DefaultStyle.main2_600
|
||||
Layout.preferredWidth: parent.width
|
||||
}
|
||||
Item {
|
||||
Layout.fillHeight: true
|
||||
}
|
||||
}
|
||||
RowLayout {
|
||||
Layout.topMargin: (modelData.hideTopMargin ? 0 : (mainItem.useVerticalLayout ? 10 : 21)) * DefaultStyle.dp
|
||||
Layout.bottomMargin: 21 * DefaultStyle.dp
|
||||
Layout.leftMargin: (mainItem.useVerticalLayout ? 0 : 17) * DefaultStyle.dp
|
||||
Layout.preferredWidth: (modelData.customWidth > 0 ? modelData.customWidth : 545) * DefaultStyle.dp
|
||||
Layout.alignment: Qt.AlignRight
|
||||
Loader {
|
||||
Layout.fillWidth: true
|
||||
sourceComponent: modelData.contentComponent
|
||||
}
|
||||
Item {
|
||||
Layout.preferredWidth: (modelData.customRightMargin > 0 ? modelData.customRightMargin : 17) * DefaultStyle.dp
|
||||
}
|
||||
}
|
||||
}
|
||||
Text {
|
||||
text: modelData.subTitle
|
||||
visible: modelData.subTitle.length > 0
|
||||
font: Typography.p1s
|
||||
wrapMode: Text.WordWrap
|
||||
color: DefaultStyle.main2_600
|
||||
Layout.preferredWidth: parent.width
|
||||
}
|
||||
Item {
|
||||
Layout.fillHeight: true
|
||||
}
|
||||
}
|
||||
RowLayout {
|
||||
Layout.topMargin: (modelData.hideTopMargin ? 0 : (mainItem.useVerticalLayout ? 10 : 21)) * DefaultStyle.dp
|
||||
Layout.bottomMargin: 21 * DefaultStyle.dp
|
||||
Layout.leftMargin: (mainItem.useVerticalLayout ? 0 : 17) * DefaultStyle.dp
|
||||
Layout.preferredWidth: (modelData.customWidth > 0 ? modelData.customWidth : 545) * DefaultStyle.dp
|
||||
Layout.alignment: Qt.AlignRight
|
||||
Loader {
|
||||
id: contentLoader
|
||||
Layout.fillWidth: true
|
||||
sourceComponent: modelData.contentComponent
|
||||
}
|
||||
Item {
|
||||
Layout.preferredWidth: (modelData.customRightMargin > 0 ? modelData.customRightMargin : 17) * DefaultStyle.dp
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue