Browse Source

Move background to ScrollView for GcodeTextArea

Lipu Fei 5 years ago
parent
commit
d1805d34be
1 changed files with 19 additions and 19 deletions
  1. 19 19
      resources/qml/MachineSettings/GcodeTextArea.qml

+ 19 - 19
resources/qml/MachineSettings/GcodeTextArea.qml

@@ -53,6 +53,25 @@ UM.TooltipArea
         anchors.left: parent.left
         anchors.right: parent.right
 
+        background: Rectangle
+        {
+            color: UM.Theme.getColor("main_background")
+            anchors.fill: parent
+
+            border.color:
+            {
+                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")
+            }
+        }
+
         TextArea
         {
             id: gcodeTextArea
@@ -66,25 +85,6 @@ UM.TooltipArea
             color: UM.Theme.getColor("text")
             wrapMode: TextEdit.NoWrap
 
-            background: Rectangle
-            {
-                color: UM.Theme.getColor("main_background")
-                anchors.fill: parent
-
-                border.color:
-                {
-                    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")
-                }
-            }
-
             onActiveFocusChanged:
             {
                 if (!activeFocus)