Browse Source

New designs use dark mode border_main for dark theme.

Remove uses of border_main_light. The only puprose of this color was to give dark mode access to the border_main of the light theme.

CURA-8991
j.delarago 3 years ago
parent
commit
1fc6b8ced6

+ 1 - 1
resources/qml/MachineSettings/GcodeTextArea.qml

@@ -91,7 +91,7 @@ UM.TooltipArea
                     }
                     }
                     if (gcodeTextArea.hovered || gcodeTextArea.activeFocus)
                     if (gcodeTextArea.hovered || gcodeTextArea.activeFocus)
                     {
                     {
-                        return UM.Theme.getColor("border_main_light")
+                        return UM.Theme.getColor("border_main")
                     }
                     }
                     return UM.Theme.getColor("border_field_light")
                     return UM.Theme.getColor("border_field_light")
                 }
                 }

+ 1 - 1
resources/qml/MachineSettings/NumericTextFieldWithUnit.qml

@@ -107,7 +107,7 @@ UM.TooltipArea
                 // Validation is OK.
                 // Validation is OK.
                 if (textFieldWithUnit.hovered || textFieldWithUnit.activeFocus)
                 if (textFieldWithUnit.hovered || textFieldWithUnit.activeFocus)
                 {
                 {
-                    return UM.Theme.getColor("border_main_light")
+                    return UM.Theme.getColor("border_main")
                 }
                 }
                 return UM.Theme.getColor("border_field_light")
                 return UM.Theme.getColor("border_field_light")
             }
             }

+ 1 - 1
resources/qml/PrintSetupHeaderButton.qml

@@ -69,7 +69,7 @@ ToolButton
             {
             {
                 target: background
                 target: background
                 color: UM.Theme.getColor("setting_control")
                 color: UM.Theme.getColor("setting_control")
-                liningColor: UM.Theme.getColor("border_main_light")
+                liningColor: UM.Theme.getColor("border_main")
             }
             }
         },
         },
         State
         State

+ 1 - 1
resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml

@@ -129,7 +129,7 @@ Item
             background: UM.UnderlineBackground
             background: UM.UnderlineBackground
             {
             {
                 id: backgroundItem
                 id: backgroundItem
-                liningColor: intentSelection.hovered ? UM.Theme.getColor("border_main_light") : UM.Theme.getColor("border_field_light")
+                liningColor: intentSelection.hovered ? UM.Theme.getColor("border_main") : UM.Theme.getColor("border_field_light")
             }
             }
 
 
             UM.SimpleButton
             UM.SimpleButton

+ 1 - 1
resources/qml/Settings/SettingExtruder.qml

@@ -135,7 +135,7 @@ SettingItem
                 }
                 }
                 if (control.hovered || control.activeFocus)
                 if (control.hovered || control.activeFocus)
                 {
                 {
-                    return UM.Theme.getColor("border_main_light")
+                    return UM.Theme.getColor("border_main")
                 }
                 }
                 return UM.Theme.getColor("border_field_light")
                 return UM.Theme.getColor("border_field_light")
             }
             }

+ 1 - 1
resources/qml/Settings/SettingOptionalExtruder.qml

@@ -136,7 +136,7 @@ SettingItem
                 }
                 }
                 if (control.hovered || control.activeFocus)
                 if (control.hovered || control.activeFocus)
                 {
                 {
-                    return UM.Theme.getColor("border_main_light")
+                    return UM.Theme.getColor("border_main")
                 }
                 }
                 return UM.Theme.getColor("border_field_light")
                 return UM.Theme.getColor("border_field_light")
             }
             }

+ 1 - 1
resources/qml/Settings/SettingTextField.qml

@@ -52,7 +52,7 @@ SettingItem
             //Validation is OK.
             //Validation is OK.
             if(hovered || input.activeFocus)
             if(hovered || input.activeFocus)
             {
             {
-                return UM.Theme.getColor("border_main_light")
+                return UM.Theme.getColor("border_main")
             }
             }
             return UM.Theme.getColor("border_field_light")
             return UM.Theme.getColor("border_field_light")
         }
         }

+ 1 - 1
resources/qml/Widgets/ComboBox.qml

@@ -33,7 +33,7 @@ ComboBox
         {
         {
             name: "highlighted"
             name: "highlighted"
             when: control.hovered || control.activeFocus
             when: control.hovered || control.activeFocus
-            PropertyChanges { target: background; liningColor: UM.Theme.getColor("border_main_light")}
+            PropertyChanges { target: background; liningColor: UM.Theme.getColor("border_main")}
         }
         }
     ]
     ]
 
 

+ 1 - 1
resources/qml/Widgets/TextField.qml

@@ -44,7 +44,7 @@ TextField
         {
         {
             name: "hovered"
             name: "hovered"
             when: textField.hovered || textField.activeFocus
             when: textField.hovered || textField.activeFocus
-            PropertyChanges { target: backgroundRectangle; liningColor: UM.Theme.getColor("border_main_light")}
+            PropertyChanges { target: backgroundRectangle; liningColor: UM.Theme.getColor("border_main")}
         }
         }
     ]
     ]