From 88739db142976f75238086283ed13635f39c0a9b Mon Sep 17 00:00:00 2001 From: Mahmoud Badri Date: Mon, 19 Apr 2021 12:58:40 +0300 Subject: [PATCH] QmlDesigner: Fix searching hidden item library categories Task-number: QDS-4136 Change-Id: I6ba2109015914af1435a03bd7a346c0eba0a8100 Reviewed-by: Miina Puuronen Reviewed-by: Thomas Hartmann --- .../itemlibrary/itemlibraryimport.cpp | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryimport.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryimport.cpp index 40892db07b3..6305855c89a 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryimport.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryimport.cpp @@ -116,18 +116,17 @@ bool ItemLibraryImport::updateCategoryVisibility(const QString &searchText, bool *changed = false; for (const auto &category : m_categoryModel.categorySections()) { - category->setCategoryVisible(ItemLibraryModel::loadCategoryVisibleState(category->categoryName())); + bool categoryChanged = false; + bool hasVisibleItems = category->updateItemVisibility(searchText, &categoryChanged); + categoryChanged |= category->setVisible(hasVisibleItems); - if (!searchText.isEmpty() || category->isCategoryVisible()) { - bool categoryChanged = false; - bool hasVisibleItems = category->updateItemVisibility(searchText, &categoryChanged); - categoryChanged |= category->setVisible(hasVisibleItems); + *changed |= categoryChanged; - *changed |= categoryChanged; + if (hasVisibleItems) + hasVisibleCategories = true; - if (hasVisibleItems) - hasVisibleCategories = true; - } + if (searchText.isEmpty()) + category->setCategoryVisible(ItemLibraryModel::loadCategoryVisibleState(category->categoryName())); } return hasVisibleCategories;