GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-07-04 16:55:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use "button" style for material info button

Browse Source 
CURA-3810
This commit is contained in:
Lipu Fei 2017-05-29 18:06:35 +02:00
parent c80e1b67a5
commit 3a3d9afc24
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
resources/themes/cura/styles.qml
View File

@ -15,7 +15,7 @@ QtObject {
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
font: UM.Theme.getFont("small") font: UM.Theme.getFont("small")
color: UM.Theme.getColor("info_button_text") color: UM.Theme.getColor("button_text")
text: control.text text: control.text
} }
@ -27,11 +27,11 @@ QtObject {
color: { color: {
if (control.pressed) { if (control.pressed) {
return UM.Theme.getColor("info_button_background_active"); return UM.Theme.getColor("button_active");
} else if (control.hovered) { } else if (control.hovered) {
return UM.Theme.getColor("info_button_background_hover"); return UM.Theme.getColor("button_hover");
} else { } else {
return UM.Theme.getColor("info_button_background"); return UM.Theme.getColor("button");
} }
} }
Behavior on color { ColorAnimation { duration: 50; } } Behavior on color { ColorAnimation { duration: 50; } }

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

@ -243,12 +243,7 @@
"layerview_support_infill": [0, 255, 255, 255], "layerview_support_infill": [0, 255, 255, 255],
"layerview_move_combing": [0, 0, 255, 255], "layerview_move_combing": [0, 0, 255, 255],
"layerview_move_retraction": [128, 128, 255, 255], "layerview_move_retraction": [128, 128, 255, 255],
"layerview_support_interface": [64, 192, 255, 255], "layerview_support_interface": [64, 192, 255, 255]
"info_button_text": [255, 255, 255, 255],
"info_button_background": [127, 127, 127, 255],
"info_button_background_hover": [24, 41, 77, 255],
"info_button_background_active": [70, 84, 113, 255]
}, },
"sizes": { "sizes": {