mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-08-05 21:13:58 -06:00
Update settings extruder comboboxes and material selection combobox to match new designs
CURA-8688
This commit is contained in:
parent
b129eb805f
commit
2fdd7b82d5
4 changed files with 26 additions and 37 deletions
|
@ -5,14 +5,14 @@ import QtQuick 2.7
|
|||
import QtQuick.Controls 2.0
|
||||
|
||||
import UM 1.5 as UM
|
||||
import Cura 1.0 as Cura
|
||||
import Cura 1.5 as Cura
|
||||
|
||||
SettingItem
|
||||
{
|
||||
id: base
|
||||
property var focusItem: control
|
||||
|
||||
contents: ComboBox
|
||||
contents: Cura.ComboBox
|
||||
{
|
||||
id: control
|
||||
anchors.fill: parent
|
||||
|
@ -113,7 +113,7 @@ SettingItem
|
|||
color: UM.Theme.getColor("setting_control_button");
|
||||
}
|
||||
|
||||
background: Rectangle
|
||||
background: UM.UnderlineBackground
|
||||
{
|
||||
color:
|
||||
{
|
||||
|
@ -127,9 +127,7 @@ SettingItem
|
|||
}
|
||||
return UM.Theme.getColor("setting_control")
|
||||
}
|
||||
radius: UM.Theme.getSize("setting_control_radius").width
|
||||
border.width: UM.Theme.getSize("default_lining").width
|
||||
border.color:
|
||||
liningColor:
|
||||
{
|
||||
if (!enabled)
|
||||
{
|
||||
|
@ -137,9 +135,9 @@ SettingItem
|
|||
}
|
||||
if (control.hovered || control.activeFocus)
|
||||
{
|
||||
return UM.Theme.getColor("setting_control_border_highlight")
|
||||
return UM.Theme.getColor("border_main_light")
|
||||
}
|
||||
return UM.Theme.getColor("setting_control_border")
|
||||
return UM.Theme.getColor("border_field_light")
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue