3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-06 13:34:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge branch '5.0'

Browse source
This commit is contained in:
Ghostkeeper 2022-05-09 17:48:50 +02:00
commit 12901e351e
No known key found for this signature in database
GPG key ID: 68F39EA88EEED5FF
9 changed files with 26 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -90,6 +90,7 @@ UM.TooltipArea
{
anchors.fill: parent
borderColor: (textFieldWithUnit.hovered || textFieldWithUnit.activeFocus) ? UM.Theme.getColor("text_field_border_hovered") : "transparent"
liningColor:
{
if (!textFieldWithUnit.enabled)
@ -109,7 +110,7 @@ UM.TooltipArea
// Validation is OK.
if (textFieldWithUnit.hovered || textFieldWithUnit.activeFocus)
{
return UM.Theme.getColor("border_main")
return UM.Theme.getColor("text_field_border_hovered")
}
return UM.Theme.getColor("border_field_light")
}

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

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

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

@ -125,15 +125,16 @@ SettingItem
}
return UM.Theme.getColor("setting_control")
}
borderColor: (base.hovered || control.activeFocus) ? UM.Theme.getSize("text_field_border_hovered") : "transparent"
liningColor:
{
if (!enabled)
{
return UM.Theme.getColor("setting_control_disabled_border")
}
if (control.hovered || control.activeFocus)
if (base.hovered || control.activeFocus)
{
return UM.Theme.getColor("border_main")
return UM.Theme.getColor("text_field_border_hovered")
}
return UM.Theme.getColor("border_field_light")
}

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

@ -126,15 +126,16 @@ SettingItem
}
return UM.Theme.getColor("setting_control")
}
borderColor: (base.hovered || control.activeFocus) ? UM.Theme.getColor("text_field_border_hovered") : "transparent"
liningColor:
{
if (!enabled)
{
return UM.Theme.getColor("setting_control_disabled_border")
}
if (control.hovered || control.activeFocus)
if (base.hovered || control.activeFocus)
{
return UM.Theme.getColor("border_main")
return UM.Theme.getColor("text_field_border_hovered")
}
return UM.Theme.getColor("border_field_light")
}

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

@ -32,6 +32,7 @@ SettingItem
anchors.fill: parent
borderColor: (hovered || input.activeFocus) ? UM.Theme.getColor("text_field_border_hovered") : "transparent"
liningColor:
{
if(!enabled)

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

@ -32,8 +32,13 @@ ComboBox
State
{
name: "highlighted"
when: control.hovered || control.activeFocus
PropertyChanges { target: background; liningColor: UM.Theme.getColor("border_main")}
when: base.hovered || control.hovered || control.activeFocus
PropertyChanges
{
target: background
borderColor: UM.Theme.getColor("text_field_border_hovered")
liningColor: UM.Theme.getColor("text_field_border_hovered")
}
}
]

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

@ -47,7 +47,12 @@ TextField
{
name: "hovered"
when: control.hovered || control.activeFocus
PropertyChanges { target: backgroundRectangle; liningColor: UM.Theme.getColor("text_field_border_hovered")}
PropertyChanges
{
target: backgroundRectangle
liningColor: UM.Theme.getColor("text_field_border_hovered")
borderColor: UM.Theme.getColor("text_field_border_hovered")
}
}
]