Merge pull request #16624 from Ultimaker/CURA-10835_make_setting_hidd…

…en_icon Icon is dragged into visible area
Ultimaker · Sep 1, 2023 · 6ef4758 · 6ef4758
2 parents e064044 + 5c2b127
commit 6ef4758
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git 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"

diff --git 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++)