From c25d0c6b2f30731b108e99c6ceccd925d764eb56 Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Fri, 2 Jun 2023 01:36:01 +0200 Subject: Get rid of scrollhelper --- resources/qml/dialogs/AliasEditor.qml | 4 ---- resources/qml/dialogs/AllowedRoomsSettingsDialog.qml | 4 ---- resources/qml/dialogs/ImagePackEditorDialog.qml | 5 ----- resources/qml/dialogs/ImagePackSettingsDialog.qml | 11 +---------- resources/qml/dialogs/PowerLevelSpacesApplyDialog.qml | 5 ----- resources/qml/dialogs/RoomDirectory.qml | 5 ----- resources/qml/dialogs/RoomMembers.qml | 5 ----- resources/qml/dialogs/RoomSettings.qml | 5 +---- resources/qml/dialogs/UserProfile.qml | 6 ------ 9 files changed, 2 insertions(+), 48 deletions(-) (limited to 'resources/qml/dialogs') diff --git a/resources/qml/dialogs/AliasEditor.qml b/resources/qml/dialogs/AliasEditor.qml index 32efff22..c49ad321 100644 --- a/resources/qml/dialogs/AliasEditor.qml +++ b/resources/qml/dialogs/AliasEditor.qml @@ -53,10 +53,6 @@ ApplicationWindow { clip: true - ScrollHelper { - flickable: parent - anchors.fill: parent - } model: editingModel spacing: 4 diff --git a/resources/qml/dialogs/AllowedRoomsSettingsDialog.qml b/resources/qml/dialogs/AllowedRoomsSettingsDialog.qml index 94ecf651..89ea5e04 100644 --- a/resources/qml/dialogs/AllowedRoomsSettingsDialog.qml +++ b/resources/qml/dialogs/AllowedRoomsSettingsDialog.qml @@ -53,10 +53,6 @@ ApplicationWindow { clip: true - ScrollHelper { - flickable: parent - anchors.fill: parent - } model: roomSettings.allowedRoomsModel spacing: 4 diff --git a/resources/qml/dialogs/ImagePackEditorDialog.qml b/resources/qml/dialogs/ImagePackEditorDialog.qml index 9e848150..4cb2c1f6 100644 --- a/resources/qml/dialogs/ImagePackEditorDialog.qml +++ b/resources/qml/dialogs/ImagePackEditorDialog.qml @@ -49,11 +49,6 @@ ApplicationWindow { model: imagePack - ScrollHelper { - flickable: parent - anchors.fill: parent - enabled: !Settings.mobileMode - } header: AvatarListTile { title: imagePack.packname diff --git a/resources/qml/dialogs/ImagePackSettingsDialog.qml b/resources/qml/dialogs/ImagePackSettingsDialog.qml index 31a34c94..b7aab2a6 100644 --- a/resources/qml/dialogs/ImagePackSettingsDialog.qml +++ b/resources/qml/dialogs/ImagePackSettingsDialog.qml @@ -55,11 +55,7 @@ ApplicationWindow { model: packlist clip: true - ScrollHelper { - flickable: parent - anchors.fill: parent - enabled: !Settings.mobileMode - } + footer: ColumnLayout { Button { @@ -217,11 +213,6 @@ ApplicationWindow { currentIndex: -1 // prevent sorting from stealing focus cacheBuffer: 500 - ScrollHelper { - flickable: parent - anchors.fill: parent - enabled: !Settings.mobileMode - } // Individual emoji delegate: AbstractButton { diff --git a/resources/qml/dialogs/PowerLevelSpacesApplyDialog.qml b/resources/qml/dialogs/PowerLevelSpacesApplyDialog.qml index 3f816143..01ec8b61 100644 --- a/resources/qml/dialogs/PowerLevelSpacesApplyDialog.qml +++ b/resources/qml/dialogs/PowerLevelSpacesApplyDialog.qml @@ -84,11 +84,6 @@ ApplicationWindow { clip: true - ScrollHelper { - flickable: parent - anchors.fill: parent - } - model: editingModel.spaces spacing: 4 cacheBuffer: 50 diff --git a/resources/qml/dialogs/RoomDirectory.qml b/resources/qml/dialogs/RoomDirectory.qml index 29adb9be..a6f53d2e 100644 --- a/resources/qml/dialogs/RoomDirectory.qml +++ b/resources/qml/dialogs/RoomDirectory.qml @@ -34,11 +34,6 @@ ApplicationWindow { anchors.fill: parent model: publicRooms - ScrollHelper { - flickable: parent - anchors.fill: parent - } - delegate: Rectangle { id: roomDirDelegate diff --git a/resources/qml/dialogs/RoomMembers.qml b/resources/qml/dialogs/RoomMembers.qml index 4952a0a9..916c6c86 100644 --- a/resources/qml/dialogs/RoomMembers.qml +++ b/resources/qml/dialogs/RoomMembers.qml @@ -106,11 +106,6 @@ ApplicationWindow { boundsBehavior: Flickable.StopAtBounds model: members - ScrollHelper { - flickable: parent - anchors.fill: parent - enabled: !Settings.mobileMode - } delegate: ItemDelegate { id: del diff --git a/resources/qml/dialogs/RoomSettings.qml b/resources/qml/dialogs/RoomSettings.qml index 6bc24058..0fa98fff 100644 --- a/resources/qml/dialogs/RoomSettings.qml +++ b/resources/qml/dialogs/RoomSettings.qml @@ -29,10 +29,7 @@ ApplicationWindow { sequence: StandardKey.Cancel onActivated: roomSettingsDialog.close() } - ScrollHelper { - flickable: flickable - anchors.fill: flickable - } + Flickable { id: flickable boundsBehavior: Flickable.StopAtBounds diff --git a/resources/qml/dialogs/UserProfile.qml b/resources/qml/dialogs/UserProfile.qml index dae43caa..b54b52a4 100644 --- a/resources/qml/dialogs/UserProfile.qml +++ b/resources/qml/dialogs/UserProfile.qml @@ -46,12 +46,6 @@ ApplicationWindow { anchors.margins: 10 footerPositioning: ListView.OverlayFooter - ScrollHelper { - flickable: parent - anchors.fill: parent - enabled: !Settings.mobileMode - } - header: ColumnLayout { id: contentL -- cgit 1.5.1