Просмотр исходного кода

Use normal text colour instead of specialised configuration item text

They were the same anyway, and they should always be the same.

Contributes to issue CURA-5876.
Ghostkeeper 6 лет назад
Родитель
Сommit
a2b1f53979

+ 4 - 6
resources/qml/Menus/ConfigurationMenu/ConfigurationItem.qml

@@ -19,8 +19,6 @@ Button
     rightPadding: 0
     leftPadding: 0
 
-    property var textColor: checked ? UM.Theme.getColor("configuration_item_text_active") : UM.Theme.getColor("configuration_item_text")
-
     contentItem: Rectangle
     {
         height: childrenRect.height
@@ -53,7 +51,7 @@ Button
                     {
                         width: Math.round(parent.width / 2)
                         printCoreConfiguration: modelData
-                        mainColor: textColor
+                        mainColor: UM.Theme.getColor("text")
                     }
                 }
             }
@@ -66,7 +64,7 @@ Button
                 visible: buildplateInformation.visible
                 width: parent.width - 2 * parent.padding
                 height: visible ? Math.round(UM.Theme.getSize("thick_lining").height / 2) : 0
-                color: textColor
+                color: UM.Theme.getColor("text")
             }
 
             Item
@@ -85,7 +83,7 @@ Button
                     sourceSize.width: width
                     sourceSize.height: height
                     source: UM.Theme.getIcon("buildplate")
-                    color: textColor
+                    color: UM.Theme.getColor("text")
                 }
 
                 Label
@@ -96,7 +94,7 @@ Button
                     anchors.leftMargin: Math.round(UM.Theme.getSize("default_margin").height / 2)
                     text: configuration.buildplateConfiguration
                     renderType: Text.NativeRendering
-                    color: textColor
+                    color: UM.Theme.getColor("text")
                 }
             }
         }

+ 1 - 1
resources/qml/Menus/ConfigurationMenu/ConfigurationListView.qml

@@ -58,7 +58,7 @@ Column
                     {
                         text: section
                         font: UM.Theme.getFont("small")
-                        color: UM.Theme.getColor("configuration_item_text")
+                        color: UM.Theme.getColor("text")
                         padding: UM.Theme.getSize("narrow_margin").width
                     }
                 }

+ 0 - 2
resources/themes/cura-light/theme.json

@@ -319,8 +319,6 @@
 
         "configuration_item": [255, 255, 255, 0],
         "configuration_item_active": [12, 169, 227, 32],
-        "configuration_item_text": [0, 0, 0, 255],
-        "configuration_item_text_active": [0, 0, 0, 255],
         "configuration_item_border": [127, 127, 127, 255],
         "configuration_item_border_active": [12, 169, 227, 32],
         "configuration_item_border_hover": [50, 130, 255, 255],