3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-12-05 16:51:12 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' into CURA-6435_new_style_add_machine

Browse source
This commit is contained in:
Lipu Fei 2019-04-10 09:06:55 +02:00 • committed by GitHub
commit 0e49d3dc12
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
25 changed files with 222 additions and 157 deletions
Download patch file Download diff file Expand all files Collapse all files

16
resources/qml/Widgets/TextField.qml
View file

@ -48,12 +48,22 @@ TextField
background: Rectangle
{
id: backgroundRectangle
anchors.fill: parent
anchors.margins: Math.round(UM.Theme.getSize("default_lining").width)
radius: UM.Theme.getSize("setting_control_radius").width
border.color: UM.Theme.getColor("setting_control_border")
color: UM.Theme.getColor("setting_control")
border.color:
{
if (!textField.enabled)
{
return UM.Theme.getColor("setting_control_disabled_border")
}
if (textField.hovered || textField.activeFocus)
{
return UM.Theme.getColor("setting_control_border_highlight")
}
return UM.Theme.getColor("setting_control_border")
}
}
}