From cb4c4214f4a4ab1e3d11c4e0d8423ab9fe9b8555 Mon Sep 17 00:00:00 2001 From: "saumya.jain" Date: Wed, 30 Aug 2023 15:28:49 +0200 Subject: [PATCH 1/2] Icon is dragged into visible area CURA-10835 --- resources/qml/Preferences/SettingVisibilityItem.qml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/resources/qml/Preferences/SettingVisibilityItem.qml b/resources/qml/Preferences/SettingVisibilityItem.qml index 8905c15124..07255306a5 100644 --- a/resources/qml/Preferences/SettingVisibilityItem.qml +++ b/resources/qml/Preferences/SettingVisibilityItem.qml @@ -20,6 +20,7 @@ Item width: childrenRect.width; height: childrenRect.height; id: checkboxTooltipArea + x: check.height UM.CheckBox { id: check @@ -40,7 +41,7 @@ Item { width: height height: check.height - anchors.left: checkboxTooltipArea.right + anchors.right: checkboxTooltipArea.left anchors.leftMargin: 2 * screenScaleFactor text: @@ -82,7 +83,7 @@ Item source: UM.Theme.getIcon("Information") - color: UM.Theme.getColor("primary_button_text") + color: UM.Theme.getColor("small_button_text") } visible: provider.properties.enabled == "False" From 5c2b127345d04d13dad7c9e425859dccc2188976 Mon Sep 17 00:00:00 2001 From: "saumya.jain" Date: Fri, 1 Sep 2023 11:12:50 +0200 Subject: [PATCH 2/2] Few minor fixes CURA-10835 --- resources/qml/Settings/SettingView.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/qml/Settings/SettingView.qml b/resources/qml/Settings/SettingView.qml index 934e19030d..c5fed795d5 100644 --- a/resources/qml/Settings/SettingView.qml +++ b/resources/qml/Settings/SettingView.qml @@ -40,7 +40,7 @@ Item Cura.TextField { id: filter - height: parent.height + implicitHeight: parent.height anchors.left: parent.left anchors.right: parent.right topPadding: height / 4 @@ -337,7 +337,7 @@ Item } function onShowTooltip(text) { base.showTooltip(delegate, Qt.point(-settingsView.x - UM.Theme.getSize("default_margin").width, 0), text) } function onHideTooltip() { base.hideTooltip() } - function onShowAllHiddenInheritedSettings() + function onShowAllHiddenInheritedSettings(category_id) { var children_with_override = Cura.SettingInheritanceManager.getChildrenKeysWithOverride(category_id) for(var i = 0; i < children_with_override.length; i++)