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

Merge remote-tracking branch 'origin/CURA-8688_qt6_cleanup' into CURA-8688_qt6_cleanup

Browse Source
This commit is contained in:
casper 2022-03-01 13:12:42 +01:00
commit 6274a6e15b
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml
View File

@ -126,13 +126,10 @@ Item
} }
} }
background: Rectangle background: UM.UnderlineBackground
{ {
id: backgroundItem id: backgroundItem
border.color: intentSelection.hovered ? UM.Theme.getColor("setting_control_border_highlight") : UM.Theme.getColor("setting_control_border") liningColor: intentSelection.hovered ? UM.Theme.getColor("border_main_light") : UM.Theme.getColor("border_field_light")
border.width: UM.Theme.getSize("default_lining").width
radius: UM.Theme.getSize("default_radius").width
color: UM.Theme.getColor("main_background")
} }
UM.SimpleButton UM.SimpleButton

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

@ -28,7 +28,7 @@
"colors": { "colors": {
"main_background": "background_1", "main_background": "background_1",
"detail_background": [63, 63, 63, 255], "detail_background": "background_2",
"message_background": "background_1", "message_background": "background_1",
"wide_lining": [31, 36, 39, 255], "wide_lining": [31, 36, 39, 255],
"thick_lining": [255, 255, 255, 60], "thick_lining": [255, 255, 255, 60],

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

@ -293,8 +293,8 @@
"setting_category_disabled_text": [24, 41, 77, 101], "setting_category_disabled_text": [24, 41, 77, 101],
"setting_category_active_text": [35, 35, 35, 255], "setting_category_active_text": [35, 35, 35, 255],
"setting_control": [255, 255, 255, 255], "setting_control": "background_2",
"setting_control_highlight": [255, 255, 255, 255], "setting_control_highlight": "background_2",
"setting_control_border": [199, 199, 199, 255], "setting_control_border": [199, 199, 199, 255],
"setting_control_border_highlight": [50, 130, 255, 255], "setting_control_border_highlight": [50, 130, 255, 255],
"setting_control_text": [35, 35, 35, 255], "setting_control_text": [35, 35, 35, 255],
@ -308,7 +308,7 @@
"setting_validation_error": [127, 127, 127, 255], "setting_validation_error": [127, 127, 127, 255],
"setting_validation_warning_background": [255, 145, 62, 255], "setting_validation_warning_background": [255, 145, 62, 255],
"setting_validation_warning": [127, 127, 127, 255], "setting_validation_warning": [127, 127, 127, 255],
"setting_validation_ok": [255, 255, 255, 255], "setting_validation_ok": "background_2",
"material_compatibility_warning": [243, 166, 59, 255], "material_compatibility_warning": [243, 166, 59, 255],