From 09c3ae628e6deda7e16fbcc57b2277c00388605c Mon Sep 17 00:00:00 2001
From: fieldOfView <aldo@fieldofview.com>
Date: Tue, 22 Mar 2022 14:46:14 +0100
Subject: Fix "double"/non-functional scrollbars on ScrollViews

---
 resources/qml/Dialogs/WorkspaceSummaryDialog.qml                | 2 +-
 resources/qml/Menus/ConfigurationMenu/ConfigurationListView.qml | 2 +-
 resources/qml/Preferences/GeneralPage.qml                       | 2 +-
 resources/qml/Preferences/Materials/MaterialsPage.qml           | 2 +-
 resources/qml/Preferences/Materials/MaterialsView.qml           | 4 ++--
 resources/qml/PrintMonitor.qml                                  | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/resources/qml/Dialogs/WorkspaceSummaryDialog.qml b/resources/qml/Dialogs/WorkspaceSummaryDialog.qml
index c5c7248a98..411dc44f83 100644
--- a/resources/qml/Dialogs/WorkspaceSummaryDialog.qml
+++ b/resources/qml/Dialogs/WorkspaceSummaryDialog.qml
@@ -67,7 +67,7 @@ UM.Dialog
 
             ScrollBar.vertical: UM.ScrollBar
             {
-                parent: scroll
+                parent: scroll.parent
                 anchors
                 {
                     top: parent.top
diff --git a/resources/qml/Menus/ConfigurationMenu/ConfigurationListView.qml b/resources/qml/Menus/ConfigurationMenu/ConfigurationListView.qml
index 1867ed6a4a..10e2435dfc 100644
--- a/resources/qml/Menus/ConfigurationMenu/ConfigurationListView.qml
+++ b/resources/qml/Menus/ConfigurationMenu/ConfigurationListView.qml
@@ -68,7 +68,7 @@ Item
         clip: true
 
         ScrollBar.vertical: UM.ScrollBar {
-            parent: container
+            parent: container.parent
             anchors
             {
                 top: parent.top
diff --git a/resources/qml/Preferences/GeneralPage.qml b/resources/qml/Preferences/GeneralPage.qml
index b8f2e1b50d..c4200e2351 100644
--- a/resources/qml/Preferences/GeneralPage.qml
+++ b/resources/qml/Preferences/GeneralPage.qml
@@ -141,7 +141,7 @@ UM.PreferencesPage
         ScrollBar.vertical: UM.ScrollBar
         {
             id: preferencesScrollBar
-            parent: preferencesScrollView
+            parent: preferencesScrollView.parent
             anchors
             {
                 top: parent.top
diff --git a/resources/qml/Preferences/Materials/MaterialsPage.qml b/resources/qml/Preferences/Materials/MaterialsPage.qml
index 9c90ecef0d..2774c2a204 100644
--- a/resources/qml/Preferences/Materials/MaterialsPage.qml
+++ b/resources/qml/Preferences/Materials/MaterialsPage.qml
@@ -126,7 +126,7 @@ UM.ManagementPage
         ScrollBar.vertical: UM.ScrollBar
         {
             id: materialScrollBar
-            parent: materialScrollView
+            parent: materialScrollView.parent
             anchors
             {
                 top: parent.top
diff --git a/resources/qml/Preferences/Materials/MaterialsView.qml b/resources/qml/Preferences/Materials/MaterialsView.qml
index 23cba249ad..2cbadc6bd6 100644
--- a/resources/qml/Preferences/Materials/MaterialsView.qml
+++ b/resources/qml/Preferences/Materials/MaterialsView.qml
@@ -94,7 +94,7 @@ Item
             ScrollBar.vertical: UM.ScrollBar
             {
                 id: scrollBar
-                parent: informationPage
+                parent: informationPage.parent
                 anchors
                 {
                     top: parent.top
@@ -536,7 +536,7 @@ Item
             ScrollBar.vertical: UM.ScrollBar
             {
                 id: settingScrollBar
-                parent: settingsPage
+                parent: settingsPage.parent
                 anchors
                 {
                     top: parent.top
diff --git a/resources/qml/PrintMonitor.qml b/resources/qml/PrintMonitor.qml
index 1ea7ccc4a3..adb004298d 100644
--- a/resources/qml/PrintMonitor.qml
+++ b/resources/qml/PrintMonitor.qml
@@ -21,7 +21,7 @@ ScrollView
     ScrollBar.vertical: UM.ScrollBar
     {
         id: scrollbar
-        parent: base
+        parent: base.parent
         anchors
         {
             right: parent.right
-- 
cgit v1.2.3