Browse Source

Use text colour specific to text in scene for job specs

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.
Ghostkeeper 7 years ago
parent
commit
b52446ed99
2 changed files with 5 additions and 3 deletions
  1. 3 3
      resources/qml/JobSpecs.qml
  2. 2 0
      resources/themes/cura/theme.json

+ 3 - 3
resources/qml/JobSpecs.qml

@@ -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 - 0
resources/themes/cura/theme.json

@@ -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],