From 85973f4a1a52ac8a1d7df0e9837edf77a2f043b2 Mon Sep 17 00:00:00 2001 From: "j.delarago" Date: Mon, 7 Feb 2022 11:55:03 +0100 Subject: [PATCH 1/3] Center Align Checkbox in per model settings visibilty menu --- plugins/PerObjectSettingsTool/SettingPickDialog.qml | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/PerObjectSettingsTool/SettingPickDialog.qml b/plugins/PerObjectSettingsTool/SettingPickDialog.qml index 5d8e1c332a..0b03ef5008 100644 --- a/plugins/PerObjectSettingsTool/SettingPickDialog.qml +++ b/plugins/PerObjectSettingsTool/SettingPickDialog.qml @@ -64,6 +64,7 @@ UM.Dialog { top: parent.top right: parent.right + verticalCenter: filterInput.verticalCenter } text: catalog.i18nc("@label:checkbox", "Show all") } From 6888fafa9674d3f537a429dd6d3fb088dbbeb685 Mon Sep 17 00:00:00 2001 From: "j.delarago" Date: Mon, 7 Feb 2022 12:10:47 +0100 Subject: [PATCH 2/3] Set correct styling for SettingCheckBox used in per model settings panel --- resources/qml/Settings/SettingCheckBox.qml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/resources/qml/Settings/SettingCheckBox.qml b/resources/qml/Settings/SettingCheckBox.qml index 1204c6dfe5..1b4e4ac143 100644 --- a/resources/qml/Settings/SettingCheckBox.qml +++ b/resources/qml/Settings/SettingCheckBox.qml @@ -91,14 +91,14 @@ SettingItem width: UM.Theme.getSize("checkbox").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.color: { if(!enabled) { - return UM.Theme.getColor("setting_control_disabled_border") + return UM.Theme.getColor("checkbox_border") } switch (propertyProvider.properties.validationState) { @@ -114,7 +114,7 @@ SettingItem // Validation is OK. 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") } @@ -122,7 +122,7 @@ SettingItem color: { if (!enabled) { - return UM.Theme.getColor("setting_control_disabled") + return UM.Theme.getColor("checkbox_disabled") } switch (propertyProvider.properties.validationState) { @@ -140,7 +140,7 @@ SettingItem { return UM.Theme.getColor("setting_control_highlight") } - return UM.Theme.getColor("setting_control") + return UM.Theme.getColor("checkbox") } UM.RecolorImage From c57220f33c692de30ebe218f7df29b599d3f6ffd Mon Sep 17 00:00:00 2001 From: "j.delarago" Date: Mon, 7 Feb 2022 13:20:45 +0100 Subject: [PATCH 3/3] Fix search icon having no left padding in DF search bar. --- plugins/DigitalLibrary/resources/qml/SelectProjectPage.qml | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/DigitalLibrary/resources/qml/SelectProjectPage.qml b/plugins/DigitalLibrary/resources/qml/SelectProjectPage.qml index eb47163d5c..24d4cbfade 100644 --- a/plugins/DigitalLibrary/resources/qml/SelectProjectPage.qml +++ b/plugins/DigitalLibrary/resources/qml/SelectProjectPage.qml @@ -49,7 +49,6 @@ Item id: searchBar Layout.fillWidth: true implicitHeight: createNewProjectButton.height - leftPadding: searchIcon.width + UM.Theme.getSize("default_margin").width * 2 focus: true onTextEdited: manager.projectFilter = text //Update the search filter when editing this text field. }