3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-25 07:33:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

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

14
resources/qml/MachineSettings/NumericTextFieldWithUnit.qml
View file

@ -91,12 +91,12 @@ UM.TooltipArea
{ {
anchors.fill: parent anchors.fill: parent
borderColor: (textFieldWithUnit.hovered || textFieldWithUnit.activeFocus) ? UM.Theme.getColor("text_field_border_hovered") : "transparent" borderColor: textFieldWithUnit.activeFocus ? UM.Theme.getColor("text_field_border_active") : "transparent"
liningColor: liningColor:
{ {
if (!textFieldWithUnit.enabled) if (!textFieldWithUnit.enabled)
{ {
return UM.Theme.getColor("setting_control_disabled_border") return UM.Theme.getColor("setting_control_disabled_border");
} }
switch (propertyProvider.properties.validationState) switch (propertyProvider.properties.validationState)
{ {
@ -109,11 +109,15 @@ UM.TooltipArea
return UM.Theme.getColor("setting_validation_warning") return UM.Theme.getColor("setting_validation_warning")
} }
// Validation is OK. // Validation is OK.
if (textFieldWithUnit.hovered || textFieldWithUnit.activeFocus) if(textFieldWithUnit.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(textFieldWithUnit.hovered)
{
return UM.Theme.getColor("text_field_border_hovered");
}
return UM.Theme.getColor("border_field_light");
} }
color: color:

1
resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml
View file

@ -129,7 +129,6 @@ Item
background: UM.UnderlineBackground background: UM.UnderlineBackground
{ {
id: backgroundItem id: backgroundItem
borderColor: intentSelection.hovered ? UM.Theme.getColor("text_field_border_hovered") : "transparent"
liningColor: intentSelection.hovered ? UM.Theme.getColor("text_field_border_hovered") : UM.Theme.getColor("border_field_light") liningColor: intentSelection.hovered ? UM.Theme.getColor("text_field_border_hovered") : UM.Theme.getColor("border_field_light")
} }

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

@ -125,18 +125,22 @@ SettingItem
} }
return UM.Theme.getColor("setting_control") 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: 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") 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: 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 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: liningColor:
{ {
if(!enabled) if(!enabled)
{ {
return UM.Theme.getColor("text_field_border_disabled") return UM.Theme.getColor("text_field_border_disabled");
} }
switch(propertyProvider.properties.validationState) switch(propertyProvider.properties.validationState)
{ {
@ -51,11 +51,15 @@ SettingItem
return UM.Theme.getColor("setting_validation_warning"); return UM.Theme.getColor("setting_validation_warning");
} }
//Validation is OK. //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: { color: {

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

@ -31,12 +31,22 @@ ComboBox
}, },
State State
{ {
name: "highlighted" name: "active"
when: base.hovered || control.hovered || control.activeFocus when: control.activeFocus
PropertyChanges
{
target: background
borderColor: UM.Theme.getColor("text_field_border_active")
liningColor: UM.Theme.getColor("text_field_border_active")
}
},
State
{
name: "highlighted"
when: (base.hovered || control.hovered) && !control.activeFocus
PropertyChanges PropertyChanges
{ {
target: background target: background
borderColor: UM.Theme.getColor("text_field_border_hovered")
liningColor: UM.Theme.getColor("text_field_border_hovered") liningColor: UM.Theme.getColor("text_field_border_hovered")
} }
} }

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

@ -44,14 +44,24 @@ TextField
PropertyChanges { target: backgroundRectangle; color: UM.Theme.getColor("setting_validation_error_background")} PropertyChanges { target: backgroundRectangle; color: UM.Theme.getColor("setting_validation_error_background")}
}, },
State State
{
name: "active"
when: control.activeFocus
PropertyChanges
{
target: backgroundRectangle
liningColor: UM.Theme.getColor("text_field_border_active")
borderColor: UM.Theme.getColor("text_field_border_active")
}
},
State
{ {
name: "hovered" name: "hovered"
when: control.hovered || control.activeFocus when: control.hovered && !control.activeFocus
PropertyChanges PropertyChanges
{ {
target: backgroundRectangle target: backgroundRectangle
liningColor: UM.Theme.getColor("text_field_border_hovered") liningColor: UM.Theme.getColor("text_field_border_hovered")
borderColor: UM.Theme.getColor("text_field_border_hovered")
} }
} }
] ]

3
resources/themes/cura-light/theme.json
View file

@ -363,7 +363,8 @@
"text_field": "background_1", "text_field": "background_1",
"text_field_border": [180, 180, 180, 255], "text_field_border": [180, 180, 180, 255],
"text_field_border_hovered": "border_accent_2", "text_field_border_hovered": "border_main",
"text_field_border_active": "border_accent_2",
"text_field_border_disabled": "background_2", "text_field_border_disabled": "background_2",
"text_field_text": "text_default", "text_field_text": "text_default",
"text_field_text_disabled": "text_disabled", "text_field_text_disabled": "text_disabled",