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

New style highlighting on borders

Browse Source 
CURA-8688
This commit is contained in:
j.delarago 2022-02-28 14:56:07 +01:00
parent 83661ebd7f
commit ce86e025d9
5 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
resources/qml/Widgets/ComboBox.qml
View File

@ -26,21 +26,18 @@ ComboBox
{ {
name: "disabled" name: "disabled"
when: !control.enabled when: !control.enabled
PropertyChanges { target: backgroundRectangle; color: UM.Theme.getColor("setting_control_disabled")} PropertyChanges { target: background; color: UM.Theme.getColor("setting_control_disabled")}
PropertyChanges { target: contentLabel; color: UM.Theme.getColor("setting_control_disabled_text")} PropertyChanges { target: contentLabel; color: UM.Theme.getColor("setting_control_disabled_text")}
}, },
State State
{ {
name: "highlighted" name: "highlighted"
when: control.hovered || control.activeFocus when: control.hovered || control.activeFocus
PropertyChanges { target: backgroundRectangle; color: UM.Theme.getColor("setting_control_highlight")} PropertyChanges { target: background; liningColor: UM.Theme.getColor("border_main_light")}
} }
] ]
background: UM.UnderlineBackground background: UM.UnderlineBackground{}
{
id: backgroundRectangle
}
indicator: UM.RecolorImage indicator: UM.RecolorImage
{ {

2
resources/qml/Widgets/RadioButton.qml
View File

@ -38,7 +38,7 @@ RadioButton
{ {
name: "highlighted" name: "highlighted"
when: radioButton.hovered || radioButton.activeFocus when: radioButton.hovered || radioButton.activeFocus
PropertyChanges { target: indicator; border.color: UM.Theme.getColor("accent_1")} PropertyChanges { target: indicator; border.color: UM.Theme.getColor("border_main_light")}
} }
] ]

1
resources/qml/Widgets/TextField.qml
View File

@ -43,6 +43,7 @@ TextField
{ {
name: "hovered" name: "hovered"
when: textField.hovered || textField.activeFocus when: textField.hovered || textField.activeFocus
PropertyChanges { target: backgroundRectangle; liningColor: UM.Theme.getColor("border_main_light")}
} }
] ]

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

@ -157,7 +157,7 @@
"checkbox": "background_1", "checkbox": "background_1",
"checkbox_hover": [43, 48, 52, 255], "checkbox_hover": [43, 48, 52, 255],
"checkbox_border": "text_disabled", "checkbox_border": "text_disabled",
"checkbox_border_hover": [255, 255, 255, 38], "checkbox_border_hover": "border_main",
"checkbox_mark": "text_default", "checkbox_mark": "text_default",
"checkbox_square": "text_disabled", "checkbox_square": "text_disabled",
"checkbox_text": "text_default", "checkbox_text": "text_default",

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

@ -323,7 +323,7 @@
"quality_slider_available": [0, 0, 0, 255], "quality_slider_available": [0, 0, 0, 255],
"checkbox": [255, 255, 255, 255], "checkbox": [255, 255, 255, 255],
"checkbox_hover": [255, 255, 255, 255], "checkbox_hover": "border_main",
"checkbox_border": [180, 180, 180, 255], "checkbox_border": [180, 180, 180, 255],
"checkbox_border_hover": [25, 110, 240, 255], "checkbox_border_hover": [25, 110, 240, 255],
"checkbox_mark": [35, 35, 35, 255], "checkbox_mark": [35, 35, 35, 255],
@ -423,7 +423,10 @@
"cloud_unavailable": [153, 153, 153, 255], "cloud_unavailable": [153, 153, 153, 255],
"connection_badge_background": [255, 255, 255, 255], "connection_badge_background": [255, 255, 255, 255],
"warning_badge_background": [0, 0, 0, 255], "warning_badge_background": [0, 0, 0, 255],
"error_badge_background": [255, 255, 255, 255] "error_badge_background": [255, 255, 255, 255],
"border_field_light": [180, 180, 180, 255],
"border_main_light": [212, 212, 212, 255]
}, },
"sizes": { "sizes": {