diff options
author | Ghostkeeper <rubend@tutanota.com> | 2022-05-10 17:04:06 +0300 |
---|---|---|
committer | Ghostkeeper <rubend@tutanota.com> | 2022-05-10 17:04:06 +0300 |
commit | fb8f50e6ef5c0c5693900bb2e5d7a06aea596f92 (patch) | |
tree | f307cbbab66e1de8fc410e73e401067210d57db8 /resources/qml/MachineSettings/NumericTextFieldWithUnit.qml | |
parent | 5c7423e007ffebddb43eda840cab8411a355f981 (diff) | |
parent | 97e2d6a4322d59b0bf7eacc7bec9621ce8cdc934 (diff) |
Merge branch '5.0'
Diffstat (limited to 'resources/qml/MachineSettings/NumericTextFieldWithUnit.qml')
-rw-r--r-- | resources/qml/MachineSettings/NumericTextFieldWithUnit.qml | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/resources/qml/MachineSettings/NumericTextFieldWithUnit.qml b/resources/qml/MachineSettings/NumericTextFieldWithUnit.qml index 2950714d6a..79114b15c6 100644 --- a/resources/qml/MachineSettings/NumericTextFieldWithUnit.qml +++ b/resources/qml/MachineSettings/NumericTextFieldWithUnit.qml @@ -91,12 +91,12 @@ UM.TooltipArea { anchors.fill: parent - borderColor: (textFieldWithUnit.hovered || textFieldWithUnit.activeFocus) ? UM.Theme.getColor("text_field_border_hovered") : "transparent" + borderColor: textFieldWithUnit.activeFocus ? UM.Theme.getColor("text_field_border_active") : "transparent" liningColor: { if (!textFieldWithUnit.enabled) { - return UM.Theme.getColor("setting_control_disabled_border") + return UM.Theme.getColor("setting_control_disabled_border"); } switch (propertyProvider.properties.validationState) { @@ -109,11 +109,15 @@ UM.TooltipArea return UM.Theme.getColor("setting_validation_warning") } // Validation is OK. - if (textFieldWithUnit.hovered || textFieldWithUnit.activeFocus) + if(textFieldWithUnit.activeFocus) { - return UM.Theme.getColor("text_field_border_hovered") + return UM.Theme.getColor("text_field_border_active"); } - return UM.Theme.getColor("border_field_light") + if(textFieldWithUnit.hovered) + { + return UM.Theme.getColor("text_field_border_hovered"); + } + return UM.Theme.getColor("border_field_light"); } color: |