diff options
| author | Mahmoud Badri <mahmoud.badri@qt.io> | 2022-11-29 19:35:10 +0200 |
|---|---|---|
| committer | Mahmoud Badri <mahmoud.badri@qt.io> | 2022-12-01 09:09:08 +0000 |
| commit | 5f7d36d1cbd80444cf00907e2f64b535747ea943 (patch) | |
| tree | 0f4dea7090f916de7685e4520915f2e247e2e08b | |
| parent | 916368ede424c90e9ecce96fe1e5d92690a71fe2 (diff) | |
QmlDesigner: Fix material browser's textures search
Change-Id: Ia0750f0f61d821deeb1d0d3630fb770803e604ee
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
3 files changed, 4 insertions, 3 deletions
diff --git a/share/qtcreator/qmldesigner/materialBrowserQmlSource/MaterialBrowser.qml b/share/qtcreator/qmldesigner/materialBrowserQmlSource/MaterialBrowser.qml index 920a1869ff..4cf2efa54e 100644 --- a/share/qtcreator/qmldesigner/materialBrowserQmlSource/MaterialBrowser.qml +++ b/share/qtcreator/qmldesigner/materialBrowserQmlSource/MaterialBrowser.qml @@ -194,7 +194,7 @@ Item { color: StudioTheme.Values.themeTextColor font.pixelSize: StudioTheme.Values.baseFontSize leftPadding: 10 - visible: materialBrowserModel.isEmpty && !searchBox.isEmpty() && materialBrowserModel.hasMaterialLibrary + visible: materialBrowserModel.isEmpty && !searchBox.isEmpty() } Text { @@ -277,7 +277,7 @@ Item { color: StudioTheme.Values.themeTextColor font.pixelSize: StudioTheme.Values.baseFontSize leftPadding: 10 - visible: materialBrowserModel.isEmpty && !searchBox.isEmpty() && materialBrowserModel.hasMaterialLibrary + visible: materialBrowserTexturesModel.isEmpty && !searchBox.isEmpty() } Text { diff --git a/src/plugins/qmldesigner/components/materialbrowser/materialbrowsertexturesmodel.cpp b/src/plugins/qmldesigner/components/materialbrowser/materialbrowsertexturesmodel.cpp index 781b43622f..3f5fde5a7c 100644 --- a/src/plugins/qmldesigner/components/materialbrowser/materialbrowsertexturesmodel.cpp +++ b/src/plugins/qmldesigner/components/materialbrowser/materialbrowsertexturesmodel.cpp @@ -54,7 +54,7 @@ bool MaterialBrowserTexturesModel::isTextureVisible(int idx) const if (!isValidIndex(idx)) return false; - return m_searchText.isEmpty() || m_textureList.at(idx).variantProperty("objectName") + return m_searchText.isEmpty() || m_textureList.at(idx).variantProperty("source") .value().toString().contains(m_searchText, Qt::CaseInsensitive); } diff --git a/src/plugins/qmldesigner/components/materialbrowser/materialbrowserwidget.cpp b/src/plugins/qmldesigner/components/materialbrowser/materialbrowserwidget.cpp index 923a2a42e3..901626b5a2 100644 --- a/src/plugins/qmldesigner/components/materialbrowser/materialbrowserwidget.cpp +++ b/src/plugins/qmldesigner/components/materialbrowser/materialbrowserwidget.cpp @@ -300,6 +300,7 @@ void MaterialBrowserWidget::reloadQmlSource() void MaterialBrowserWidget::updateSearch() { m_materialBrowserModel->setSearchText(m_filterText); + m_materialBrowserTexturesModel->setSearchText(m_filterText); m_quickWidget->update(); } |