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

Update SettingTextField to match TextField

Browse Source 
CURA-8991
This commit is contained in:
j.delarago 2022-03-04 13:53:59 +01:00
parent 7dabcfafb0
commit 1eb16c0ec5
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
resources/qml/Settings/SettingTextField.qml
View File

@ -36,7 +36,7 @@ SettingItem
{ {
if(!enabled) if(!enabled)
{ {
return UM.Theme.getColor("setting_control_disabled_border") return UM.Theme.getColor("text_field_border_disabled")
} }
switch(propertyProvider.properties.validationState) switch(propertyProvider.properties.validationState)
{ {
@ -52,15 +52,15 @@ SettingItem
//Validation is OK. //Validation is OK.
if(hovered || input.activeFocus) if(hovered || input.activeFocus)
{ {
return UM.Theme.getColor("border_main") return UM.Theme.getColor("text_field_border_hovered")
} }
return UM.Theme.getColor("border_field_light") return UM.Theme.getColor("text_field_border")
} }
color: { color: {
if(!enabled) if(!enabled)
{ {
return UM.Theme.getColor("setting_control_disabled") return UM.Theme.getColor("text_field")
} }
switch(propertyProvider.properties.validationState) switch(propertyProvider.properties.validationState)
{ {
@ -76,7 +76,7 @@ SettingItem
return UM.Theme.getColor("setting_validation_ok") return UM.Theme.getColor("setting_validation_ok")
default: default:
return UM.Theme.getColor("setting_control") return UM.Theme.getColor("text_field")
} }
} }

2
resources/themes/cura-light/theme.json
View File

@ -355,8 +355,6 @@
"text_field_text": "text_default", "text_field_text": "text_default",
"text_field_text_disabled": "text_disabled", "text_field_text_disabled": "text_disabled",
"category_background": "background_2", "category_background": "background_2",
"tooltip": [25, 25, 25, 255], "tooltip": [25, 25, 25, 255],