From 87f94e680bf0da3f96d03e2a72c6848cf7451c3c Mon Sep 17 00:00:00 2001
From: Remco Burema <r.burema@ultimaker.com>
Date: Tue, 16 Nov 2021 10:20:08 +0100
Subject: [PATCH] Use re-usable search-bar for Settings search as well.

done as part of CURA-8559
---
 resources/qml/SearchBar.qml            |  1 +
 resources/qml/Settings/SettingView.qml | 33 ++++----------------------
 2 files changed, 6 insertions(+), 28 deletions(-)

diff --git a/resources/qml/SearchBar.qml b/resources/qml/SearchBar.qml
index ce1808252e..4d9c003653 100644
--- a/resources/qml/SearchBar.qml
+++ b/resources/qml/SearchBar.qml
@@ -15,6 +15,7 @@ Cura.TextField
     leftPadding: searchIcon.width + UM.Theme.getSize("default_margin").width * 2
 
     placeholderText: catalog.i18nc("@placeholder", "Search")
+    font.italic: true
 
     UM.RecolorImage
     {
diff --git a/resources/qml/Settings/SettingView.qml b/resources/qml/Settings/SettingView.qml
index 074946c6bd..5fc0b60381 100644
--- a/resources/qml/Settings/SettingView.qml
+++ b/resources/qml/Settings/SettingView.qml
@@ -41,39 +41,19 @@ Item
             repeat: false
         }
 
-        Cura.TextField
+        Cura.SearchBar
         {
             id: filter
             height: parent.height
             anchors.left: parent.left
             anchors.right: parent.right
-            leftPadding: searchIcon.width + UM.Theme.getSize("default_margin").width * 2
-            placeholderText:  catalog.i18nc("@label:textbox", "Search settings")
-            font.italic: true
+
+            placeholderText:  catalog.i18nc("@label:textbox", "Search settings")  // Overwrite
 
             property var expandedCategories
             property bool lastFindingSettings: false
 
-            UM.RecolorImage
-            {
-                id: searchIcon
-
-                anchors
-                {
-                    verticalCenter: parent.verticalCenter
-                    left: parent.left
-                    leftMargin: UM.Theme.getSize("default_margin").width
-                }
-                source: UM.Theme.getIcon("search")
-                height: UM.Theme.getSize("small_button_icon").height
-                width: height
-                color: UM.Theme.getColor("text")
-            }
-
-            onTextChanged:
-            {
-                settingsSearchTimer.restart()
-            }
+            onTextChanged: settingsSearchTimer.restart()
 
             onEditingFinished:
             {
@@ -86,10 +66,7 @@ Item
                 }
             }
 
-            Keys.onEscapePressed:
-            {
-                filter.text = ""
-            }
+            Keys.onEscapePressed: filter.text = ""
 
             function updateDefinitionModel()
             {