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

Use text colour specific to text in scene for job specs

Browse Source 
Because the scene may have a different background colour than the rest, we need to be able to have inverted colours for that part.

Contributes to issue CURA-4148.
This commit is contained in:
Ghostkeeper 2017-08-23 14:58:43 +02:00
parent f5169f53f3
commit b52446ed99
No known key found for this signature in database
GPG Key ID: C5F96EE2BC0F7E75
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
resources/qml/JobSpecs.qml
View File

@ -86,7 +86,7 @@ Item {
height: UM.Theme.getSize("save_button_specs_icons").height;
sourceSize.width: width;
sourceSize.height: width;
color: control.hovered ? UM.Theme.getColor("setting_control_button_hover") : UM.Theme.getColor("text");
color: control.hovered ? UM.Theme.getColor("text_scene_hover") : UM.Theme.getColor("text_scene");
source: UM.Theme.getIcon("pencil");
}
}
@ -116,7 +116,7 @@ Item {
regExp: /^[^\\ \/ \*\?\|\[\]]*$/
}
style: TextFieldStyle{
textColor: UM.Theme.getColor("setting_control_text");
textColor: UM.Theme.getColor("text_scene");
font: UM.Theme.getFont("default_bold");
background: Rectangle {
opacity: 0
@ -135,7 +135,7 @@ Item {
height: UM.Theme.getSize("jobspecs_line").height
verticalAlignment: Text.AlignVCenter
font: UM.Theme.getFont("small")
color: UM.Theme.getColor("text_subtext")
color: UM.Theme.getColor("text_scene")
text: CuraApplication.getSceneBoundingBoxString
}
}

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

@ -66,6 +66,8 @@
"text_pressed": [255, 255, 255, 204],
"text_subtext": [255, 255, 255, 172],
"text_emphasis": [255, 255, 255, 255],
"text_scene": [39, 44, 48, 255],
"text_scene_hover": [43, 48, 52, 255],
"error": [212, 31, 53, 255],
"sidebar_header_bar": [39, 44, 48, 255],