GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-14 12:55:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move background to ScrollView for GcodeTextArea

Browse Source
This commit is contained in:
Lipu Fei 2019-05-14 11:43:24 +02:00
parent 5280ec4af5
commit d1805d34be
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
resources/qml/MachineSettings/GcodeTextArea.qml
View File

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