From c29468002293cdc28ba22030d6553eba23bd4ff5 Mon Sep 17 00:00:00 2001
From: "j.delarago" <joeydelarago@gmail.com>
Date: Thu, 21 Apr 2022 15:52:15 +0200
Subject: [PATCH] Fix scrollbar filling space by replacing custom
 implementation with generic UM.ScrollBar

CURA-9144
---
 .../resources/qml/SelectProjectPage.qml       | 26 ++-----------------
 .../Marketplace/resources/qml/Packages.qml    | 23 +++-------------
 2 files changed, 6 insertions(+), 43 deletions(-)

diff --git a/plugins/DigitalLibrary/resources/qml/SelectProjectPage.qml b/plugins/DigitalLibrary/resources/qml/SelectProjectPage.qml
index ed632124e5..60beb66e11 100644
--- a/plugins/DigitalLibrary/resources/qml/SelectProjectPage.qml
+++ b/plugins/DigitalLibrary/resources/qml/SelectProjectPage.qml
@@ -6,7 +6,7 @@ import QtQuick.Window 2.2
 import QtQuick.Controls 2.3
 import QtQuick.Layouts 1.1
 
-import UM 1.2 as UM
+import UM 1.6 as UM
 import Cura 1.7 as Cura
 
 import DigitalFactory 1.0 as DF
@@ -148,29 +148,7 @@ Item
             contentHeight: projectsListView.implicitHeight
             anchors.fill: parent
 
-            ScrollBar.vertical: ScrollBar
-            {
-                // Vertical ScrollBar, styled similarly to the scrollBar in the settings panel
-                id: verticalScrollBar
-                visible: flickableView.contentHeight > flickableView.height
-
-                background: Rectangle
-                {
-                    implicitWidth: UM.Theme.getSize("scrollbar").width
-                    radius: Math.round(implicitWidth / 2)
-                    color: UM.Theme.getColor("scrollbar_background")
-                }
-
-                contentItem: Rectangle
-                {
-                    id: scrollViewHandle
-                    implicitWidth: UM.Theme.getSize("scrollbar").width
-                    radius: Math.round(implicitWidth / 2)
-
-                    color: verticalScrollBar.pressed ? UM.Theme.getColor("scrollbar_handle_down") : verticalScrollBar.hovered ? UM.Theme.getColor("scrollbar_handle_hover") : UM.Theme.getColor("scrollbar_handle")
-                    Behavior on color { ColorAnimation { duration: 50; } }
-                }
-            }
+            ScrollBar.vertical: UM.ScrollBar { id: verticalScrollBar }
 
             Column
             {
diff --git a/plugins/Marketplace/resources/qml/Packages.qml b/plugins/Marketplace/resources/qml/Packages.qml
index d86536639c..74a18bccd3 100644
--- a/plugins/Marketplace/resources/qml/Packages.qml
+++ b/plugins/Marketplace/resources/qml/Packages.qml
@@ -1,9 +1,10 @@
-// Copyright (c) 2021 Ultimaker B.V.
+// Copyright (c) 2022 Ultimaker B.V.
 // Cura is released under the terms of the LGPLv3 or higher.
 
 import QtQuick 2.15
 import QtQuick.Controls 2.15
-import UM 1.4 as UM
+
+import UM 1.6 as UM
 
 
 ListView
@@ -51,23 +52,7 @@ ListView
         }
     }
 
-    ScrollBar.vertical: ScrollBar
-    {
-        // Vertical ScrollBar, styled similarly to the scrollBar in the settings panel
-        id: verticalScrollBar
-        visible: packages.contentHeight > packages.height
-        anchors.right: parent.right
-        background: Item {}
-
-        contentItem: Rectangle
-        {
-            id: scrollViewHandle
-            implicitWidth: UM.Theme.getSize("scrollbar").width
-            radius: Math.round(implicitWidth / 2)
-            color: verticalScrollBar.pressed ? UM.Theme.getColor("scrollbar_handle_down") : verticalScrollBar.hovered ? UM.Theme.getColor("scrollbar_handle_hover") : UM.Theme.getColor("scrollbar_handle")
-            Behavior on color { ColorAnimation { duration: 50; } }
-        }
-    }
+    ScrollBar.vertical: UM.ScrollBar { id: verticalScrollBar }
 
     delegate: MouseArea
     {