Make GCode TextField scrollable

CURA-6057
This commit is contained in:
Lipu Fei 2019-04-04 14:18:51 +02:00
parent 2e50c19949
commit 06f427ef46

View file

@ -44,44 +44,48 @@ UM.TooltipArea
renderType: Text.NativeRendering renderType: Text.NativeRendering
} }
TextArea ScrollView
{ {
id: gcodeTextArea
anchors.top: titleLabel.bottom anchors.top: titleLabel.bottom
anchors.topMargin: UM.Theme.getSize("default_margin").height anchors.topMargin: UM.Theme.getSize("default_margin").height
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
hoverEnabled: true TextArea
selectByMouse: true
font: UM.Theme.getFont("fixed")
renderType: Text.NativeRendering
text: (propertyProvider.properties.value) ? propertyProvider.properties.value : ""
wrapMode: TextEdit.NoWrap
background: Rectangle
{ {
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: onActiveFocusChanged:
{
if (!activeFocus)
{ {
propertyProvider.setPropertyValue("value", text) if (!activeFocus)
{
propertyProvider.setPropertyValue("value", text)
}
} }
} }
} }