3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-07 23:17:32 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

New designs use dark mode border_main for dark theme.

Browse source 
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
This commit is contained in:
j.delarago 2022-03-04 13:22:55 +01:00
parent b3e8c7190e
commit 1fc6b8ced6
9 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/qml/MachineSettings/GcodeTextArea.qml
View file

@ -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")
} }

2
resources/qml/MachineSettings/NumericTextFieldWithUnit.qml
View file

@ -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")
} }

2
resources/qml/PrintSetupHeaderButton.qml
View file

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

2
resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml
View file

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

2
resources/qml/Settings/SettingExtruder.qml
View file

@ -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")
} }

2
resources/qml/Settings/SettingOptionalExtruder.qml
View file

@ -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")
} }

2
resources/qml/Settings/SettingTextField.qml
View file

@ -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")
} }

2
resources/qml/Widgets/ComboBox.qml
View file

@ -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")}
} }
] ]

2
resources/qml/Widgets/TextField.qml
View file

@ -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")}
} }
] ]