From d1805d34befbe0e06eebc1672febcb474db3cfd8 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 14 May 2019 11:43:24 +0200 Subject: [PATCH] Move background to ScrollView for GcodeTextArea --- .../qml/MachineSettings/GcodeTextArea.qml | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/resources/qml/MachineSettings/GcodeTextArea.qml b/resources/qml/MachineSettings/GcodeTextArea.qml index 3914687fc8..a5c1c4ca04 100644 --- a/resources/qml/MachineSettings/GcodeTextArea.qml +++ b/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)