From 06f427ef4602a0ee9b653c5e6f71f0cf3ffb710c Mon Sep 17 00:00:00 2001
From: Lipu Fei <lipu.fei815@gmail.com>
Date: Thu, 4 Apr 2019 14:18:51 +0200
Subject: [PATCH] Make GCode TextField scrollable

CURA-6057
---
 .../qml/MachineSettings/GcodeTextArea.qml     | 52 ++++++++++---------
 1 file changed, 28 insertions(+), 24 deletions(-)

diff --git a/resources/qml/MachineSettings/GcodeTextArea.qml b/resources/qml/MachineSettings/GcodeTextArea.qml
index ef9540791e..eb20cdc856 100644
--- a/resources/qml/MachineSettings/GcodeTextArea.qml
+++ b/resources/qml/MachineSettings/GcodeTextArea.qml
@@ -44,44 +44,48 @@ UM.TooltipArea
         renderType: Text.NativeRendering
     }
 
-    TextArea
+    ScrollView
     {
-        id: gcodeTextArea
         anchors.top: titleLabel.bottom
         anchors.topMargin: UM.Theme.getSize("default_margin").height
         anchors.bottom: parent.bottom
         anchors.left: parent.left
         anchors.right: parent.right
 
-        hoverEnabled: true
-        selectByMouse: true
-
-        font: UM.Theme.getFont("fixed")
-        renderType: Text.NativeRendering
-        text: (propertyProvider.properties.value) ? propertyProvider.properties.value : ""
-        wrapMode: TextEdit.NoWrap
-
-        background: Rectangle
+        TextArea
         {
-            border.color:
+            id: gcodeTextArea
+
+            hoverEnabled: true
+            selectByMouse: true
+
+            font: UM.Theme.getFont("fixed")
+            renderType: Text.NativeRendering
+            text: (propertyProvider.properties.value) ? propertyProvider.properties.value : ""
+            wrapMode: TextEdit.NoWrap
+
+            background: Rectangle
             {
-                if (!gcodeTextArea.enabled)
+                border.color:
                 {
-                    return UM.Theme.getColor("setting_control_disabled_border")
+                    if (!gcodeTextArea.enabled)
+                    {
+                        return UM.Theme.getColor("setting_control_disabled_border")
+                    }
+                    if (gcodeTextArea.hovered || gcodeTextArea.activeFocus)
+                    {
+                        return UM.Theme.getColor("setting_control_border_highlight")
+                    }
+                    return UM.Theme.getColor("setting_control_border")
                 }
-                if (gcodeTextArea.hovered || gcodeTextArea.activeFocus)
-                {
-                    return UM.Theme.getColor("setting_control_border_highlight")
-                }
-                return UM.Theme.getColor("setting_control_border")
             }
-        }
 
-        onActiveFocusChanged:
-        {
-            if (!activeFocus)
+            onActiveFocusChanged:
             {
-                propertyProvider.setPropertyValue("value", text)
+                if (!activeFocus)
+                {
+                    propertyProvider.setPropertyValue("value", text)
+                }
             }
         }
     }