GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-13 18:36:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

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
Show Stats 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)
{
return UM.Theme.getColor("border_main_light")
return UM.Theme.getColor("border_main")
}
return UM.Theme.getColor("border_field_light")
}

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

@ -107,7 +107,7 @@ UM.TooltipArea
// Validation is OK.
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")
}

2
resources/qml/PrintSetupHeaderButton.qml
View File

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

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

@ -129,7 +129,7 @@ Item
background: UM.UnderlineBackground
{
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

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

@ -135,7 +135,7 @@ SettingItem
}
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")
}

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

@ -136,7 +136,7 @@ SettingItem
}
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")
}

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

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

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

@ -33,7 +33,7 @@ ComboBox
{
name: "highlighted"
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"
when: textField.hovered || textField.activeFocus
PropertyChanges { target: backgroundRectangle; liningColor: UM.Theme.getColor("border_main_light")}
PropertyChanges { target: backgroundRectangle; liningColor: UM.Theme.getColor("border_main")}
}
]