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

Use border only on active state

Browse source 
Contributes to issue CURA-9217.
This commit is contained in:
Ghostkeeper 2022-05-10 16:03:47 +02:00
parent 35f5c3f959
commit 97e2d6a432
No known key found for this signature in database
GPG key ID: D2A8871EE34EC59A
8 changed files with 65 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

16
resources/qml/Settings/SettingExtruder.qml
View file

@ -125,18 +125,22 @@ SettingItem
}
return UM.Theme.getColor("setting_control")
}
borderColor: (base.hovered || control.activeFocus) ? UM.Theme.getSize("text_field_border_hovered") : "transparent"
borderColor: control.activeFocus ? UM.Theme.getSize("text_field_border_active") : "transparent"
liningColor:
{
if (!enabled)
if(!enabled)
{
return UM.Theme.getColor("setting_control_disabled_border")
return UM.Theme.getColor("setting_control_disabled_border");
}
if (base.hovered || control.activeFocus)
if(control.activeFocus)
{
return UM.Theme.getColor("text_field_border_hovered")
return UM.Theme.getColor("text_field_border_active");
}
return UM.Theme.getColor("border_field_light")
if(base.hovered)
{
return UM.Theme.getColor("text_field_border_hovered");
}
return UM.Theme.getColor("border_field_light");
}
}

16
resources/qml/Settings/SettingOptionalExtruder.qml
View file

@ -126,18 +126,22 @@ SettingItem
}
return UM.Theme.getColor("setting_control")
}
borderColor: (base.hovered || control.activeFocus) ? UM.Theme.getColor("text_field_border_hovered") : "transparent"
borderColor: control.activeFocus ? UM.Theme.getColor("text_field_border_active") : "transparent"
liningColor:
{
if (!enabled)
if(!enabled)
{
return UM.Theme.getColor("setting_control_disabled_border")
return UM.Theme.getColor("setting_control_disabled_border");
}
if (base.hovered || control.activeFocus)
if(control.activeFocus)
{
return UM.Theme.getColor("text_field_border_hovered")
return UM.Theme.getColor("text_field_border_active");
}
return UM.Theme.getColor("border_field_light")
if(base.hovered)
{
return UM.Theme.getColor("text_field_border_hovered");
}
return UM.Theme.getColor("border_field_light");
}
}

14
resources/qml/Settings/SettingTextField.qml
View file

@ -32,12 +32,12 @@ SettingItem
anchors.fill: parent
borderColor: (hovered || input.activeFocus) ? UM.Theme.getColor("text_field_border_hovered") : "transparent"
borderColor: input.activeFocus ? UM.Theme.getColor("text_field_border_active") : "transparent"
liningColor:
{
if(!enabled)
{
return UM.Theme.getColor("text_field_border_disabled")
return UM.Theme.getColor("text_field_border_disabled");
}
switch(propertyProvider.properties.validationState)
{
@ -51,11 +51,15 @@ SettingItem
return UM.Theme.getColor("setting_validation_warning");
}
//Validation is OK.
if(hovered || input.activeFocus)
if(input.activeFocus)
{
return UM.Theme.getColor("text_field_border_hovered")
return UM.Theme.getColor("text_field_border_active");
}
return UM.Theme.getColor("text_field_border")
if(hovered)
{
return UM.Theme.getColor("text_field_border_hovered");
}
return UM.Theme.getColor("text_field_border");
}
color: {