fix #LINQT-1331 add flickables for 13" screens

This commit is contained in:
Gaelle Braud 2024-10-08 16:58:43 +02:00
parent aade817755
commit fe40a9586b
4 changed files with 258 additions and 236 deletions

View file

@ -78,11 +78,19 @@ LoginLayout {
} }
] ]
centerContent: [ centerContent: [
ColumnLayout { Flickable {
anchors.left: parent.left anchors.left: parent.left
anchors.top: parent.top anchors.top: parent.top
anchors.leftMargin: 127 * DefaultStyle.dp anchors.leftMargin: 127 * DefaultStyle.dp
anchors.topMargin: 70 * DefaultStyle.dp anchors.topMargin: 70 * DefaultStyle.dp
anchors.bottom: parent.bottom
width: contentWidth
contentWidth: content.implicitWidth
contentHeight: content.implicitHeight
clip: true
flickableDirection: Flickable.VerticalFlick
ColumnLayout {
id: content
spacing: 0 spacing: 0
LoginForm { LoginForm {
id: loginForm id: loginForm
@ -105,6 +113,7 @@ LoginLayout {
text: qsTr("Configuration distante") text: qsTr("Configuration distante")
onClicked: {fetchConfigDialog.open()} onClicked: {fetchConfigDialog.open()}
} }
}
}, },
Image { Image {
z: -1 z: -1

View file

@ -81,9 +81,15 @@ LoginLayout {
Component { Component {
id: firstItem id: firstItem
Flickable {
width: contentWidth
contentWidth: content.implicitWidth
contentHeight: content.implicitHeight
clip: true
flickableDirection: Flickable.VerticalFlick
ColumnLayout { ColumnLayout {
id: content
spacing: 85 * DefaultStyle.dp spacing: 85 * DefaultStyle.dp
Layout.maximumHeight: 420 * DefaultStyle.dp
ColumnLayout { ColumnLayout {
spacing: 0 spacing: 0
ColumnLayout { ColumnLayout {
@ -178,9 +184,17 @@ LoginLayout {
} }
} }
} }
}
Component { Component {
id: secondItem id: secondItem
Flickable {
width: contentWidth
contentWidth: content.implicitWidth
contentHeight: content.implicitHeight
clip: true
flickableDirection: Flickable.VerticalFlick
ColumnLayout { ColumnLayout {
id: content
spacing: 2 * DefaultStyle.dp spacing: 2 * DefaultStyle.dp
ColumnLayout { ColumnLayout {
spacing: 16 * DefaultStyle.dp spacing: 16 * DefaultStyle.dp
@ -239,6 +253,7 @@ LoginLayout {
KeyNavigation.down: transportCbox KeyNavigation.down: transportCbox
} }
} }
}
FormItemLayout { FormItemLayout {
label: qsTr("Transport") label: qsTr("Transport")
contentItem: ComboBox { contentItem: ComboBox {
@ -258,7 +273,6 @@ LoginLayout {
}) })
} }
} }
}
TemporaryText { TemporaryText {
id: errorText id: errorText
@ -347,6 +361,7 @@ LoginLayout {
} }
} }
} }
}
centerContent: [ centerContent: [
Control.StackView { Control.StackView {

View file

@ -33,8 +33,6 @@ LoginLayout {
centerContent: ColumnLayout { centerContent: ColumnLayout {
spacing: 80 * DefaultStyle.dp spacing: 80 * DefaultStyle.dp
Layout.topMargin: 70 * DefaultStyle.dp
Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
RowLayout { RowLayout {
id: radioButtonsLayout id: radioButtonsLayout
Layout.fillWidth: true Layout.fillWidth: true

View file

@ -67,10 +67,10 @@ Rectangle {
id: centerLayout id: centerLayout
Layout.fillHeight: true Layout.fillHeight: true
Layout.fillWidth: true Layout.fillWidth: true
z: 1
} }
Image { Image {
id: bottomMountains id: bottomMountains
z: -1
source: AppIcons.belledonne source: AppIcons.belledonne
fillMode: Image.Stretch fillMode: Image.Stretch
Layout.fillWidth: true Layout.fillWidth: true