From a20dac4c9b95d8308f38af08397318ee23599e45 Mon Sep 17 00:00:00 2001
From: Jaime van Kessel <nallath@gmail.com>
Date: Tue, 15 Feb 2022 15:08:06 +0100
Subject: [PATCH] Update ReadOnlyTextArea to controls 2

CURA-8685
---
 .../qml/Preferences/Materials/MaterialsView.qml | 11 ++++++-----
 resources/qml/Preferences/ReadOnlyTextArea.qml  | 17 +++++++++++------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/resources/qml/Preferences/Materials/MaterialsView.qml b/resources/qml/Preferences/Materials/MaterialsView.qml
index 6d153f5960..ecb9870fcf 100644
--- a/resources/qml/Preferences/Materials/MaterialsView.qml
+++ b/resources/qml/Preferences/Materials/MaterialsView.qml
@@ -363,10 +363,11 @@ Item
             ReadOnlyTextArea
             {
                 text: properties.description;
-                width: 2 * informationPage.columnWidth
+                width: informationPage.columnWidth * 2
+                height: 0.75 * informationPage.columnWidth
                 wrapMode: Text.WordWrap
 
-                readOnly: !base.editingEnabled;
+                readOnly: !base.editingEnabled
 
                 onEditingFinished: base.setMetaDataEntry("description", properties.description, text)
             }
@@ -375,11 +376,11 @@ Item
 
             ReadOnlyTextArea
             {
-                text: properties.adhesion_info;
+                text: properties.adhesion_info
                 width: 2 * informationPage.columnWidth
                 wrapMode: Text.WordWrap
-
-                readOnly: !base.editingEnabled;
+                height: 0.75 * informationPage.columnWidth
+                readOnly: !base.editingEnabled
 
                 onEditingFinished: base.setMetaDataEntry("adhesion_info", properties.adhesion_info, text)
             }
diff --git a/resources/qml/Preferences/ReadOnlyTextArea.qml b/resources/qml/Preferences/ReadOnlyTextArea.qml
index 2c553ac2ca..97a89ff080 100644
--- a/resources/qml/Preferences/ReadOnlyTextArea.qml
+++ b/resources/qml/Preferences/ReadOnlyTextArea.qml
@@ -2,9 +2,9 @@
 // Cura is released under the terms of the LGPLv3 or higher.
 
 import QtQuick 2.1
-import QtQuick.Controls 1.1
+import QtQuick.Controls 2.15
 
-Item
+ScrollView
 {
     id: base
 
@@ -15,17 +15,22 @@ Item
 
     property bool readOnly: false
 
-    width: textArea.width
-    height: textArea.height
-
     TextArea
     {
         id: textArea
 
         enabled: !base.readOnly
         opacity: base.readOnly ? 0.5 : 1.0
+        selectByMouse: true
 
-        anchors.fill: parent
+        background: Rectangle
+        {
+            radius: UM.Theme.getSize("setting_control_radius").width
+            color: enabled ? UM.Theme.getColor("setting_control_disabled") : UM.Theme.getColor("setting_control")
+        }
+
+        color: UM.Theme.getColor("text")
+        font: UM.Theme.getFont("default")
 
         Keys.onReturnPressed:
         {