GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-12 20:39:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'CURA-8378_improve_checkbox_visibility' of github.com:Ultimaker/Cura

Browse Source
This commit is contained in:
Jaime van Kessel 2022-02-08 15:31:56 +01:00
commit 91b3d116bf
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/DigitalLibrary/resources/qml/SelectProjectPage.qml
View File

@ -49,7 +49,6 @@ Item
id: searchBar id: searchBar
Layout.fillWidth: true Layout.fillWidth: true
implicitHeight: createNewProjectButton.height implicitHeight: createNewProjectButton.height
leftPadding: searchIcon.width + UM.Theme.getSize("default_margin").width * 2
focus: true focus: true
onTextEdited: manager.projectFilter = text //Update the search filter when editing this text field. onTextEdited: manager.projectFilter = text //Update the search filter when editing this text field.
} }

1
plugins/PerObjectSettingsTool/SettingPickDialog.qml
View File

@ -64,6 +64,7 @@ UM.Dialog
{ {
top: parent.top top: parent.top
right: parent.right right: parent.right
verticalCenter: filterInput.verticalCenter
} }
text: catalog.i18nc("@label:checkbox", "Show all") text: catalog.i18nc("@label:checkbox", "Show all")
} }

10
resources/qml/Settings/SettingCheckBox.qml
View File

@ -91,14 +91,14 @@ SettingItem
width: UM.Theme.getSize("checkbox").width width: UM.Theme.getSize("checkbox").width
height: width height: width
radius: UM.Theme.getSize("setting_control_radius").width radius: UM.Theme.getSize("checkbox_radius").width
border.width: UM.Theme.getSize("default_lining").width border.width: UM.Theme.getSize("default_lining").width
border.color: border.color:
{ {
if(!enabled) if(!enabled)
{ {
return UM.Theme.getColor("setting_control_disabled_border") return UM.Theme.getColor("checkbox_border")
} }
switch (propertyProvider.properties.validationState) switch (propertyProvider.properties.validationState)
{ {
@ -114,7 +114,7 @@ SettingItem
// Validation is OK. // Validation is OK.
if (control.containsMouse || control.activeFocus || hovered) if (control.containsMouse || control.activeFocus || hovered)
{ {
return UM.Theme.getColor("setting_control_border_highlight") return UM.Theme.getColor("checkbox_border_hover")
} }
return UM.Theme.getColor("setting_control_border") return UM.Theme.getColor("setting_control_border")
} }
@ -122,7 +122,7 @@ SettingItem
color: { color: {
if (!enabled) if (!enabled)
{ {
return UM.Theme.getColor("setting_control_disabled") return UM.Theme.getColor("checkbox_disabled")
} }
switch (propertyProvider.properties.validationState) switch (propertyProvider.properties.validationState)
{ {
@ -140,7 +140,7 @@ SettingItem
{ {
return UM.Theme.getColor("setting_control_highlight") return UM.Theme.getColor("setting_control_highlight")
} }
return UM.Theme.getColor("setting_control") return UM.Theme.getColor("checkbox")
} }
UM.RecolorImage UM.RecolorImage