From 7bda1336da7a33a9ce86f852165582c9208919f2 Mon Sep 17 00:00:00 2001
From: Ghostkeeper <rubend@tutanota.com>
Date: Mon, 17 Jan 2022 17:54:13 +0100
Subject: [PATCH] Use new scrollbar with QtControls 2 scroll view

A bit confusing that you have to set the parent and position manually, but okay.

Contributes to issue CURA-8686.
---
 resources/qml/Widgets/ScrollableTextArea.qml | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/resources/qml/Widgets/ScrollableTextArea.qml b/resources/qml/Widgets/ScrollableTextArea.qml
index 6becf75cb1..b9ccc4271b 100644
--- a/resources/qml/Widgets/ScrollableTextArea.qml
+++ b/resources/qml/Widgets/ScrollableTextArea.qml
@@ -1,10 +1,10 @@
-// Copyright (c) 2019 Ultimaker B.V.
+// Copyright (c) 2022 Ultimaker B.V.
 // Cura is released under the terms of the LGPLv3 or higher.
 
 import QtQuick 2.10
 import QtQuick.Controls 2.3
 
-import UM 1.3 as UM
+import UM 1.5 as UM
 import Cura 1.1 as Cura
 
 
@@ -13,12 +13,26 @@ import Cura 1.1 as Cura
 //
 ScrollView
 {
+    id: scrollableTextAreaBase
     property alias textArea: _textArea
 
     property var back_color: UM.Theme.getColor("main_background")
     property var do_borders: true
 
     clip: true
+    ScrollBar.vertical: UM.ScrollBar
+    {
+        parent: scrollableTextAreaBase
+        anchors
+        {
+            right: parent.right
+            rightMargin: parent.background.border.width
+            top: parent.top
+            topMargin: rightMargin
+            bottom: parent.bottom
+            bottomMargin: rightMargin
+        }
+    }
 
     background: Rectangle  // Border
     {