diff --git a/src/app/commoncomponents/JamiFlickable.qml b/src/app/commoncomponents/JamiFlickable.qml index 8ca8a1f0ce26822e41baa563cc2cd9a18b7f87ca..8dd4012915c72cb51ee4117e1c362b755046e6fd 100644 --- a/src/app/commoncomponents/JamiFlickable.qml +++ b/src/app/commoncomponents/JamiFlickable.qml @@ -40,6 +40,9 @@ Flickable { orientation: Qt.Horizontal } + // HACK: remove after migration to Qt 6.7+ + boundsBehavior: Flickable.StopAtBounds + Keys.onLeftPressed: horizontalScrollBar.decrease() Keys.onRightPressed: horizontalScrollBar.increase() Keys.onUpPressed: verticalScrollBar.decrease() diff --git a/src/app/commoncomponents/JamiListView.qml b/src/app/commoncomponents/JamiListView.qml index 22b3b2b72129dab76c6089d3df0b2e18f3c97fc8..ecc7a1fedde9bd49d7c340e4b40be1f8a008c603 100644 --- a/src/app/commoncomponents/JamiListView.qml +++ b/src/app/commoncomponents/JamiListView.qml @@ -34,6 +34,9 @@ ListView { attachedFlickableMoving: root.moving } + // HACK: remove after migration to Qt 6.7+ + boundsBehavior: Flickable.StopAtBounds + Keys.onUpPressed: verticalScrollBar.decrease() Keys.onDownPressed: verticalScrollBar.increase() } diff --git a/src/app/mainview/components/MessageBarTextArea.qml b/src/app/mainview/components/MessageBarTextArea.qml index 2b1c3007d890ed42536a532609e9bed85589cc0b..5d5cf3787f5c890bdb09e2a57fbde410f976d1c2 100644 --- a/src/app/mainview/components/MessageBarTextArea.qml +++ b/src/app/mainview/components/MessageBarTextArea.qml @@ -82,8 +82,9 @@ JamiFlickable { ScrollBar.vertical.visible: text ScrollBar.horizontal.visible: text - boundsMovement: Flickable.StopAtBounds - boundsBehavior: Flickable.DragOverBounds + // HACK: remove after migration to Qt 6.7+ + boundsBehavior: Flickable.StopAtBounds + interactive: true function resetEditableText() { diff --git a/src/app/mainview/components/MessagesResearchView.qml b/src/app/mainview/components/MessagesResearchView.qml index c8e045ebd51b490dcfd79ee97bad796399a545cd..0459c868c21d125b0d521b3ee3f69187053d3798 100644 --- a/src/app/mainview/components/MessagesResearchView.qml +++ b/src/app/mainview/components/MessagesResearchView.qml @@ -30,6 +30,10 @@ ListView { id: root spacing: 10 + + // HACK: remove after migration to Qt 6.7+ + boundsBehavior: Flickable.StopAtBounds + model: SortFilterProxyModel { id: proxyModel diff --git a/src/app/settingsview/SettingsSidePanel.qml b/src/app/settingsview/SettingsSidePanel.qml index 4f4ee4a778f956a26a1e3230d87a92b255292f2b..5f62f01881ef5332b795e9ae0a4a343ab3b58188 100644 --- a/src/app/settingsview/SettingsSidePanel.qml +++ b/src/app/settingsview/SettingsSidePanel.qml @@ -281,6 +281,9 @@ SidePanelBase { clip: true contentHeight: contentItem.childrenRect.height + // HACK: remove after migration to Qt 6.7+ + boundsBehavior: Flickable.StopAtBounds + model: getHeaders() delegate: ColumnLayout { id: col @@ -329,6 +332,9 @@ SidePanelBase { clip: true visible: isChildSelected + // HACK: remove after migration to Qt 6.7+ + boundsBehavior: Flickable.StopAtBounds + model: modelData.children delegate: ColumnLayout { id: childCol diff --git a/src/app/settingsview/components/ConnectionMonitoringTable.qml b/src/app/settingsview/components/ConnectionMonitoringTable.qml index 9932177015277d993440a7cddfd21f7c0cc24cc3..749c3e803ad186135059687adde849a3d060f35a 100644 --- a/src/app/settingsview/components/ConnectionMonitoringTable.qml +++ b/src/app/settingsview/components/ConnectionMonitoringTable.qml @@ -37,6 +37,9 @@ ListView { spacing: 5 cacheBuffer: 10 + // HACK: remove after migration to Qt 6.7+ + boundsBehavior: Flickable.StopAtBounds + property int rota: 0 header: Rectangle { @@ -141,6 +144,9 @@ ListView { model: Count + // HACK: remove after migration to Qt 6.7+ + boundsBehavior: Flickable.StopAtBounds + delegate: RowLayout { id: rowLayoutDelegate height: 40