Use availableWidth of scroll view

Author: TheOneRing

src/gui/qml/FolderDelegate.qml

@@ -147,7 +147,9 @@ Pane {
             id: scrollView
             Layout.fillHeight: true
             Layout.fillWidth: true
+            padding: folderSyncPanel.spacing
 
+            contentWidth: availableWidth
             ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
             ScrollBar.vertical.policy: ScrollBar.AlwaysOn
 
@@ -172,7 +174,7 @@ Pane {
                     id: folderDelegate
 
                     implicitHeight: normalSize
-                    width: ListView.view.width - scrollView.ScrollBar.vertical.width - folderSyncPanel.spacing
+                    width: scrollView.availableWidth
 
                     required property string displayName
                     required property var errorMsg
@@ -235,8 +237,6 @@ Pane {
 
                         SpaceDelegate {
                             anchors.fill: parent
-                            Layout.fillHeight: true
-                            Layout.fillWidth: true
                             spacing: folderSyncPanel.spacing
 
                             description: folderDelegate.subtitle
@@ -333,7 +333,6 @@ Pane {
                         // directly position at the top
                         anchors.right: parent.right
                         anchors.top: parent.top
-                        anchors.rightMargin: folderSyncPanel.spacing - paintedWidth
                         anchors.topMargin: folderSyncPanel.spacing
 
                         // this is just a visual hint that we have a context menu

src/gui/spaces/qml/SpacesView.qml

@@ -31,11 +31,12 @@ Pane {
     Accessible.name: qsTr("Spaces")
 
     spacing: 10
-
     ScrollView {
         id: scrollView
         anchors.fill: parent
         clip: true
+        rightPadding: spacesView.spacing * 2
+        contentWidth: availableWidth
         ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
         ScrollBar.vertical.policy: ScrollBar.AlwaysOn
 
@@ -84,7 +85,7 @@ Pane {
 
                 required property int index
 
-                width: ListView.view.width - scrollView.ScrollBar.vertical.width - spacesView.spacing
+                width: scrollView.availableWidth
 
                 implicitHeight: normalSize
 
@@ -114,21 +115,14 @@ Pane {
                     background: Rectangle {
                         color: spaceDelegate.ListView.isCurrentItem ? scrollView.palette.highlight : scrollView.palette.base
                     }
-
-                    RowLayout {
+                    SpaceDelegate {
                         anchors.fill: parent
-
                         spacing: spacesView.spacing
-                        SpaceDelegate {
-                            Layout.fillWidth: true
-                            Layout.fillHeight: true
-                            spacing: spacesView.spacing
-
-                            title: spaceDelegate.name
-                            description: spaceDelegate.subtitle
-                            imageSource: spaceDelegate.space.image.qmlImageUrl
-                            descriptionWrapMode: Label.WordWrap
-                        }
+
+                        title: spaceDelegate.name
+                        description: spaceDelegate.subtitle
+                        imageSource: spaceDelegate.space.image.qmlImageUrl
+                        descriptionWrapMode: Label.WordWrap
                     }
 
                     MouseArea {