fix #LINQT-1887 add scrollbars in meeting details for small screens

This commit is contained in:
Gaelle Braud 2025-08-26 09:28:52 +02:00
parent 5e09348c3d
commit 4203a9c9c0
3 changed files with 51 additions and 35 deletions

View file

@ -16,6 +16,7 @@ FocusScope{
property ConferenceInfoGui conferenceInfoGui property ConferenceInfoGui conferenceInfoGui
property color searchBarColor: DefaultStyle.grey_100 property color searchBarColor: DefaultStyle.grey_100
property color searchBarBorderColor: "transparent" property color searchBarBorderColor: "transparent"
property int participantscSrollBarRightMargin: Math.round(8 * DefaultStyle.dp)
function clearSelectedParticipants() { function clearSelectedParticipants() {
// TODO // TODO
@ -131,7 +132,8 @@ FocusScope{
anchors.top: parent.top anchors.top: parent.top
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: Math.round(8 * DefaultStyle.dp) anchors.rightMargin: mainItem.participantscSrollBarRightMargin
visible: participantList.height < participantList.contentHeight
} }
} }
SearchBar { SearchBar {

View file

@ -16,7 +16,9 @@ FocusScope {
ColumnLayout { ColumnLayout {
id: formLayout id: formLayout
spacing: Math.round(16 * DefaultStyle.dp) spacing: Math.round(16 * DefaultStyle.dp)
anchors.fill: parent anchors.left: parent.left
anchors.right: parent.right
anchors.top: parent.top
Component.onCompleted: { Component.onCompleted: {
endHour.selectedDateTime = mainItem.conferenceInfoGui.core.endDateTime endHour.selectedDateTime = mainItem.conferenceInfoGui.core.endDateTime

View file

@ -132,7 +132,7 @@ AbstractMainPage {
anchors.bottomMargin: Math.round(30 * DefaultStyle.dp) anchors.bottomMargin: Math.round(30 * DefaultStyle.dp)
height: parent.height - anchors.topMargin height: parent.height - anchors.topMargin
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
contentHeight: overridenRightPanelStackView.currentItem.childrenRect.height contentHeight: overridenRightPanelStackView.currentItem ? overridenRightPanelStackView.currentItem.childrenRect.height : 0
contentWidth: width contentWidth: width
clip: true clip: true
Control.ScrollBar.vertical: ScrollBar { Control.ScrollBar.vertical: ScrollBar {
@ -141,12 +141,16 @@ AbstractMainPage {
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.right: parent.right anchors.right: parent.right
} }
Control.StackView { contentChildren: ColumnLayout {
id: overridenRightPanelStackView
anchors.fill: parent anchors.fill: parent
anchors.rightMargin: Math.round(10 * DefaultStyle.dp) anchors.rightMargin: Math.round(10 * DefaultStyle.dp)
height: currentItem ? currentItem.height : 0
width: Math.round(393 * DefaultStyle.dp) width: Math.round(393 * DefaultStyle.dp)
Control.StackView {
id: overridenRightPanelStackView
Layout.fillWidth: true
Layout.fillHeight: true
height: currentItem ? currentItem.height : 0
}
} }
} }
@ -384,12 +388,12 @@ AbstractMainPage {
property bool isCreation property bool isCreation
property ConferenceInfoGui conferenceInfoGui property ConferenceInfoGui conferenceInfoGui
width: overridenRightPanelStackView.width width: overridenRightPanelStackView.width
height: editLayout.height
ColumnLayout { ColumnLayout {
id: editLayout id: editLayout
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
anchors.top: parent.top anchors.top: parent.top
height: childrenRect.height
spacing: 0 spacing: 0
Section { Section {
Layout.fillWidth: true Layout.fillWidth: true
@ -468,7 +472,7 @@ AbstractMainPage {
isCreation: editFocusScope.isCreation isCreation: editFocusScope.isCreation
conferenceInfoGui: editFocusScope.conferenceInfoGui conferenceInfoGui: editFocusScope.conferenceInfoGui
Layout.fillWidth: true Layout.fillWidth: true
Layout.fillHeight: true Layout.preferredHeight: childrenRect.height
onAddParticipantsRequested: { onAddParticipantsRequested: {
overridenRightPanelStackView.push(addParticipants, {"conferenceInfoGui": conferenceInfoGui, "container": overridenRightPanelStackView}) overridenRightPanelStackView.push(addParticipants, {"conferenceInfoGui": conferenceInfoGui, "container": overridenRightPanelStackView})
@ -515,16 +519,23 @@ AbstractMainPage {
Component { Component {
id: addParticipants id: addParticipants
ColumnLayout { FocusScope{
id: addParticipantInItem
property Control.StackView container property Control.StackView container
property ConferenceInfoGui conferenceInfoGui property ConferenceInfoGui conferenceInfoGui
width: overridenRightPanelStackView.width
ColumnLayout {
id: addParticipantsLayout
spacing: Math.round(18 * DefaultStyle.dp) spacing: Math.round(18 * DefaultStyle.dp)
FocusScope{ anchors.left: parent.left
anchors.right: parent.right
anchors.top: parent.top
anchors.bottom: parent.bottom
ColumnLayout {
id: title
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: childrenRect.height Layout.preferredHeight: childrenRect.height
ColumnLayout {
spacing: Math.round(4 * DefaultStyle.dp) spacing: Math.round(4 * DefaultStyle.dp)
Layout.fillWidth: true
RowLayout { RowLayout {
id: addParticipantsButtons id: addParticipantsButtons
spacing: Math.round(10 * DefaultStyle.dp) spacing: Math.round(10 * DefaultStyle.dp)
@ -576,12 +587,14 @@ AbstractMainPage {
Layout.fillWidth: true Layout.fillWidth: true
} }
} }
}
AddParticipantsForm { AddParticipantsForm {
id: addParticipantLayout id: addParticipantLayout
Layout.fillWidth: true Layout.fillWidth: true
Layout.fillHeight: true Layout.fillHeight: true
conferenceInfoGui: parent.conferenceInfoGui height: addParticipantInItem.height - title.height
conferenceInfoGui: addParticipantInItem.conferenceInfoGui
participantscSrollBarRightMargin: 0
}
} }
} }
} }
@ -590,7 +603,6 @@ AbstractMainPage {
id: meetingDetail id: meetingDetail
FocusScope{ FocusScope{
width: overridenRightPanelStackView.width width: overridenRightPanelStackView.width
height: meetingDetailsLayout.childrenRect.height
ColumnLayout { ColumnLayout {
id: meetingDetailsLayout id: meetingDetailsLayout
anchors.left: parent.left anchors.left: parent.left