From f7854225fa232d592f23a40cb259122d8f9211bc Mon Sep 17 00:00:00 2001
From: fieldOfView <aldo@fieldofview.com>
Date: Mon, 14 Nov 2016 10:21:15 +0100
Subject: [PATCH] Restore expanded categories when clearing filter

---
 resources/qml/Settings/SettingView.qml | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/resources/qml/Settings/SettingView.qml b/resources/qml/Settings/SettingView.qml
index d47c06053c..3c94d87034 100644
--- a/resources/qml/Settings/SettingView.qml
+++ b/resources/qml/Settings/SettingView.qml
@@ -32,9 +32,25 @@ Item
 
         placeholderText: catalog.i18nc("@label:textbox", "Filter...")
 
+        property var expandedCategories
+        property bool lastFilterEmpty: true
+
         onTextChanged: {
             definitionsModel.filter = {"label": "*" + text};
-            definitionsModel.expanded = text.length > 0 ? ["*"] : [""]
+            var _filterEmpty = (text.length == 0);
+            if(_filterEmpty != lastFilterEmpty)
+            {
+                if(!_filterEmpty)
+                {
+                    expandedCategories = definitionsModel.expanded.slice();
+                    definitionsModel.expanded = ["*"];
+                }
+                else
+                {
+                    definitionsModel.expanded = expandedCategories;
+                }
+                lastFilterEmpty = _filterEmpty;
+            }
         }
     }
 
@@ -55,7 +71,8 @@ Item
             spacing: UM.Theme.getSize("default_lining").height;
             cacheBuffer: 1000000;   // Set a large cache to effectively just cache every list item.
 
-            model: UM.SettingDefinitionsModel {
+            model: UM.SettingDefinitionsModel
+            {
                 id: definitionsModel;
                 containerId: Cura.MachineManager.activeDefinitionId
                 visibilityHandler: UM.SettingPreferenceVisibilityHandler { }